From 76848d617210c0efb32d5a78cffae4353fbeee6b Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 19 Dec 2016 09:26:46 +0100 Subject: [PATCH] Changed: Minor changes --- code/ryzom/server/src/input_output_service/chat_manager.cpp | 4 ++-- .../server/src/input_output_service/string_manager_parser.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/ryzom/server/src/input_output_service/chat_manager.cpp b/code/ryzom/server/src/input_output_service/chat_manager.cpp index 872aa4501..f20d4300d 100644 --- a/code/ryzom/server/src/input_output_service/chat_manager.cpp +++ b/code/ryzom/server/src/input_output_service/chat_manager.cpp @@ -1236,7 +1236,7 @@ void CChatManager::chatParamInGroup( TGroupId& grpId, const std::string & phrase CMirrorPropValueRO instanceId( TheDataset, *itM, DSPropertyAI_INSTANCE ); // check the ai instance for region chat - if (chatGrp.Type != CChatGroup::region + if (chatGrp.Type != CChatGroup::region || instanceId == senderInstanceId) { const CEntityId &eid = TheDataset.getEntityId(*itM); @@ -1816,7 +1816,7 @@ void CChatManager::tell2( const TDataSetRow& sender, const TDataSetRow& receiver bms.serial( senderInfos->NameIndex ); bms.serial( id); - + msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length()); CUnifiedNetwork::getInstance()->send(TServiceId(receiverInfos->EntityId.getDynamicId()), msgout); } diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp index c13c0a987..ef55570f9 100644 --- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp +++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp @@ -1864,7 +1864,6 @@ void CStringManager::init(NLMISC::CLog *log) if (_SheetInfo.empty()) { - // std::map container; // Load the sheet std::vector exts; exts.push_back("creature");