Merge fixes from core branch

3 years ago · b9e71480f4
parent e62991d40c
commit b9e71480f4
1 changed files with 1 additions and 1 deletions
--- a/ryzom/server/src/entities_game_service/player_manager/character.h
+++ b/ryzom/server/src/entities_game_service/player_manager/character.h
@ -1984,7 +1984,7 @@ public:
 	virtual float getActualDamageFromExplosionWithArmor(float dmg) const;

 	/// send temp inventory close impulsion to client
-	void sendCloseTempInventoryImpulsion();
+	void sendCloseTempInventoryImpulsion(bool onlyIfEmpty = false);

 	/// set a fame value for the player, send info to the client.
 	void setFameValuePlayer(uint32 factionIndex, sint32 playerFame, sint32 fameMax, uint16 fameTrend);