Changed: Synchronization with SVN

code/ryzom/client/data/gamedev/interfaces_v3/help.xml

@@ -864,7 +864,7 @@
     </group>
   </group>
   <define id="cs_url"
-          value="http://atys.ryzom.com/callback/index.php?mode=load" />
+          value="http://app.ryzom.com/ticket_system/index.php?mode=load" />
   <group type="container"
          id="cs_browser"
          w="410"

code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml

@@ -682,8 +682,8 @@
 						onclick_l="leave_modal" />
 	</group>
 	
-	<group id="webstart" posref="MM MM" w="800" h="600" active="true" >
+	<group id="webstart" posref="BR BR" w="100" h="60" active="true" >
-		<group id="content" x="0" y="0" w="800" h="600" posref="MM MM" >
+		<group id="content" x="0" y="0" w="100" h="60" posref="MM MM" >
 			<group id="webstart_html" type="html" posref="MM MM" 
 				url="" 
 				title_prefix="uiQuickhelpTitle"

code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp

@@ -138,6 +138,14 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 	ucstring entityName = entity->getDisplayName();
 	ucstring entityTitle = entity->getTitle();
 
+	// For some NPC's the name is empty and only a title is given,
+	// in that case, treat the title as the name.
+	if (entityName.empty())
+	{
+		entityName = entityTitle;
+		entityTitle.clear();
+	}
+
 	ucstring entityTag1 = entity->getTag(1);
 	ucstring entityTag2 = entity->getTag(2);
 	ucstring entityTag3 = entity->getTag(3);
@@ -174,7 +182,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 			bars[i]= false;
 		name= !entityName.empty() && pIM->getDbProp(dbEntry+"NPCNAME")->getValueBool();
 		symbol= false;
-		title= (entityName.empty() && pIM->getDbProp(dbEntry+"NPCNAME")->getValueBool()) || pIM->getDbProp(dbEntry+"NPCTITLE")->getValueBool();
+		title= !entityTitle.empty() && pIM->getDbProp(dbEntry+"NPCTITLE")->getValueBool();
 		guildName= false;
 		templateName = "in_scene_user_info";
 		rpTags = (!entityTag1.empty()  ||  !entityTag2.empty()  || !entityTag3.empty()  || !entityTag4.empty() ) && pIM->getDbProp(dbEntry+"RPTAGS")->getValueBool();
@@ -511,13 +519,13 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 						{
 							info->delView(logoOver);
 						}
-						//leftGroup->setW( leftGroup->getW() + 42 );
+						leftGroup->setW( leftGroup->getW() + 42 );
 					}
 					else
 					{
 						info->delView(logo);
 						info->delView(logoOver);
-						//leftGroup->setX(0);
+						leftGroup->setX(0);
 					}
 					leftGroup->invalidateCoords();
 				}
@@ -887,6 +895,8 @@ void CGroupInSceneUserInfo::updateDynamicData ()
 		_Name->setColor(entityColor);
 		_Name->setModulateGlobalColor(false);
 		ucstring entityName = _Entity->getDisplayName();
+		if (entityName.empty())
+			entityName = _Entity->getTitle();
 		if (pPlayer != NULL)
 			if (pPlayer->isAFK())
 				entityName += CI18N::get("uiAFK");

code/ryzom/client/src/interface_v3/guild_manager.cpp

@@ -362,44 +362,47 @@ void CGuildManager::update()
 			if (node && node->getValueBool())
 			{
 				// See if we need to show any online/offline messages
-				static vector<SGuildMember> CachedGuildMembers;
+				static map<ucstring, SGuildMember> CachedGuildMembers;
 				ucstring onlineMessage = CI18N::get("uiPlayerOnline");
 				ucstring offlineMessage = CI18N::get("uiPlayerOffline");
 
 				for (uint i = 0; i < _GuildMembers.size(); ++i)
 				{
-					for (uint j = 0; j < CachedGuildMembers.size(); ++j)
+					map<ucstring, SGuildMember>::const_iterator it = CachedGuildMembers.find(_GuildMembers[i].Name);
+					if ( it != CachedGuildMembers.end() )
 					{
-						// Status change is from offline to online/abroad online or vice versa. 
+						if ( (*it).second.Online == _GuildMembers[i].Online)
-						TCharConnectionState prevState = CachedGuildMembers[j].Online;
-						TCharConnectionState curState = _GuildMembers[i].Online;
-						bool showMsg = (prevState != curState) && 
-									   (CachedGuildMembers[j].Name == _GuildMembers[i].Name) &&
-									   (prevState == ccs_offline || curState == ccs_offline);
-
-						if (showMsg)
 						{
-							ucstring msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
+							// Online status not changed for this member
-							strFindReplace(msg, "%s", _GuildMembers[i].Name);
+							continue;
-							string cat = getStringCategory(msg, msg);
-							map<string, CClientConfig::SSysInfoParam>::const_iterator it;
-							NLMISC::CRGBA col = CRGBA::Yellow;
-							it = ClientCfg.SystemInfoParams.find(toLower(cat));
-							if (it != ClientCfg.SystemInfoParams.end())
-							{
-								col = it->second.Color;
-							}
-							bool dummy;
-							PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy);
-							break;
 						}
+
+						if ( (*it).second.Online != ccs_offline && _GuildMembers[i].Online != ccs_offline)
+						{
+							// Not from offline, or to offline, so don't show anything
+							continue;
+						}
+
+						ucstring msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
+						strFindReplace(msg, "%s", _GuildMembers[i].Name);
+						string cat = getStringCategory(msg, msg);
+						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
+						NLMISC::CRGBA col = CRGBA::Yellow;
+						it = ClientCfg.SystemInfoParams.find(toLower(cat));
+						if (it != ClientCfg.SystemInfoParams.end())
+						{
+							col = it->second.Color;
+						}
+						bool dummy;
+						PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy);
+						break;
 					}
 				}
 
 				CachedGuildMembers.clear();
 				for (uint i = 0; i < _GuildMembers.size(); ++i)
 				{
-					CachedGuildMembers.push_back(_GuildMembers[i]);
+					CachedGuildMembers.insert(make_pair(_GuildMembers[i].Name, _GuildMembers[i]));
 				}
 			}