Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Almost completely stripped, saving the final piece for tomorrow

Browse Source 
((Double clicking from list of chat people on right of chats))
This commit is contained in:
Lirusaito
2012-01-05 21:56:48 -05:00
parent c6ce417fac
commit 566152c230
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloateractivespeakers.cpp
View File

@@ -123,7 +123,7 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_
// Also set the legacy name. We will need it to initiate a new // Also set the legacy name. We will need it to initiate a new
// IM session. // IM session.
speaker_ptr->mLegacyName = avatar_name.getLegacyName(); speaker_ptr->mLegacyName = LLCacheName::cleanFullName(avatar_name.getLegacyName());
// [/Ansariel: Display name support] // [/Ansariel: Display name support]
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g

5
indra/newview/llfloateravatarlist.cpp
View File

@@ -878,15 +878,12 @@ void LLFloaterAvatarList::onClickIM(void* userdata)
// Single avatar // Single avatar
LLUUID agent_id = ids[0]; LLUUID agent_id = ids[0];
char buffer[MAX_STRING];
// [Ansariel: Display name support] // [Ansariel: Display name support]
// snprintf(buffer, MAX_STRING, "%s", avlist->mAvatars[agent_id].getName().c_str());
LLAvatarName avatar_name; LLAvatarName avatar_name;
if (LLAvatarNameCache::get(agent_id, &avatar_name)) if (LLAvatarNameCache::get(agent_id, &avatar_name))
{ {
snprintf(buffer, MAX_STRING, "%s", avatar_name.getLegacyName().c_str());
gIMMgr->setFloaterOpen(TRUE); gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(buffer,IM_NOTHING_SPECIAL,agent_id); gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id);
} }
// [Ansariel: Display name support] // [Ansariel: Display name support]
} }

2
indra/newview/llfloaterfriends.cpp
View File

@@ -914,7 +914,7 @@ void LLPanelFriends::onClickIM(void* user_data)
if (info && LLAvatarNameCache::get(agent_id, &avatar_name)) if (info && LLAvatarNameCache::get(agent_id, &avatar_name))
{ {
gIMMgr->setFloaterOpen(TRUE); gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(avatar_name.getLegacyName(),IM_NOTHING_SPECIAL,agent_id); gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id);
} }
// [/Ansariel: Display name support] // [/Ansariel: Display name support]
} }

4
indra/newview/llviewermenu.cpp
View File

@@ -7368,9 +7368,7 @@ class LLAvatarSendIM : public view_listener_t
gIMMgr->setFloaterOpen(TRUE); gIMMgr->setFloaterOpen(TRUE);
//EInstantMessage type = have_agent_callingcard(gLastHitObjectID) //EInstantMessage type = have_agent_callingcard(gLastHitObjectID)
// ? IM_SESSION_ADD : IM_SESSION_CARDLESS_START; // ? IM_SESSION_ADD : IM_SESSION_CARDLESS_START;
gIMMgr->addSession(name, gIMMgr->addSession(LLCacheName::cleanFullName(name),IM_NOTHING_SPECIAL,avatar->getID());
IM_NOTHING_SPECIAL,
avatar->getID());
} }
return true; return true;
} }

4
indra/newview/llviewermessage.cpp
View File

@@ -1657,7 +1657,7 @@ static std::string clean_name_from_im(const std::string& name, EInstantMessage t
case IM_FRIENDSHIP_OFFERED: case IM_FRIENDSHIP_OFFERED:
case IM_FRIENDSHIP_ACCEPTED: case IM_FRIENDSHIP_ACCEPTED:
case IM_FRIENDSHIP_DECLINED_DEPRECATED: case IM_FRIENDSHIP_DECLINED_DEPRECATED:
//IM_TYPING_START case IM_TYPING_START:
//IM_TYPING_STOP //IM_TYPING_STOP
return LLCacheName::cleanFullName(name); return LLCacheName::cleanFullName(name);
default: default:
@@ -3888,7 +3888,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
LL_DEBUGS("Messaging") << "process_agent_movement_complete()" << LL_ENDL; LL_DEBUGS("Messaging") << "process_agent_movement_complete()" << LL_ENDL;
// *TODO: check timestamp to make sure the movement compleation // *TODO: check timestamp to make sure the movement completion
// makes sense. // makes sense.
LLVector3 agent_pos; LLVector3 agent_pos;
msg->getVector3Fast(_PREHASH_Data, _PREHASH_Position, agent_pos); msg->getVector3Fast(_PREHASH_Data, _PREHASH_Position, agent_pos);