From e06a78a243541fa3a408d9192e36e565e2e8b38f Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 23 Oct 2010 17:12:00 +0200
Subject: [PATCH] Changed: #1135 Merge changes from Ryzom patch 1.10

---
 .../src/entities_game_service/player_manager/character.cpp   | 4 ++--
 .../src/entities_game_service/player_manager/character.h     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
index 96802b11d..4c74bdb63 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
@@ -2893,8 +2893,8 @@ void CCharacter::postLoadTreatment()
 	}
 
 	{
-	H_AUTO(LockTicketInInventory);
-	lockTicketInInventory();
+		H_AUTO(LockTicketInInventory);
+		lockTicketInInventory();
 	}
 
 	// if EId translator has been initialized by SU, check contact list
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h
index b989a321f..e68641a44 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h
@@ -3160,7 +3160,10 @@ private:
 
 	/// nb of auras affecting this player
 	uint8						_NbAuras;
-	
+
+	/// nb of users channels
+	uint8						_NbUserChannels;
+
 	// for a power/combat event, stores start and end ticks
 	struct CFlagTickRange {