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

More of e2b011590d

Browse Source 
Fixing up the name system, missed two parts.
This commit is contained in:
Lirusaito
2012-12-06 21:04:06 -05:00
parent 457276fa5d
commit 0100cd2f36
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloateractivespeakers.cpp
View File

@@ -70,6 +70,8 @@ const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f);
const LLColor4 ACTIVE_COLOR(0.5f, 0.5f, 0.5f, 1.f); const LLColor4 ACTIVE_COLOR(0.5f, 0.5f, 0.5f, 1.f);
const F32 TYPING_ANIMATION_FPS = 2.5f; const F32 TYPING_ANIMATION_FPS = 2.5f;
static void on_avatar_name_lookup(const LLUUID&, const LLAvatarName& avatar_name, std::string& mDisplayName);
LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerType type) : LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerType type) :
mStatus(LLSpeaker::STATUS_TEXT_ONLY), mStatus(LLSpeaker::STATUS_TEXT_ONLY),
mLastSpokeTime(0.f), mLastSpokeTime(0.f),
@@ -102,13 +104,17 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy
void LLSpeaker::lookupName() void LLSpeaker::lookupName()
{ {
LLAvatarNameCache::getPNSName(mID, mDisplayName); LLAvatarNameCache::get(mID, boost::bind(&on_avatar_name_lookup, _1, _2, boost::ref(mDisplayName)));
// 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.
gCacheName->getFullName(mID, mLegacyName); gCacheName->getFullName(mID, mLegacyName);
mLegacyName = LLCacheName::cleanFullName(mLegacyName); mLegacyName = LLCacheName::cleanFullName(mLegacyName);
}
static void on_avatar_name_lookup(const LLUUID&, const LLAvatarName& avatar_name, std::string& mDisplayName)
{
LLAvatarNameCache::getPNSName(avatar_name, mDisplayName);
// [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
// TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventually get fixed // TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventually get fixed
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))

15
indra/newview/llimpanel.cpp
View File

@@ -1298,10 +1298,21 @@ void LLFloaterIMPanel::init(const std::string& session_label)
} }
void LLFloaterIMPanel::lookupName() void LLFloaterIMPanel::lookupName()
{
LLAvatarNameCache::get(mOtherParticipantUUID, boost::bind(&LLFloaterIMPanel::onAvatarNameLookup, _1, _2, this));
}
//static
void LLFloaterIMPanel::onAvatarNameLookup(const LLUUID&, const LLAvatarName& avatar_name, void* data)
{
LLFloaterIMPanel* self = (LLFloaterIMPanel*)data;
if (self && sFloaterIMPanels.count(self) != 0)
{ {
std::string title; std::string title;
if (LLAvatarNameCache::getPNSName(mOtherParticipantUUID, title)) LLAvatarNameCache::getPNSName(avatar_name, title);
setTitle(title); self->setTitle(title);
}
} }
LLFloaterIMPanel::~LLFloaterIMPanel() LLFloaterIMPanel::~LLFloaterIMPanel()

1
indra/newview/llimpanel.h
View File

@@ -197,6 +197,7 @@ public:
virtual ~LLFloaterIMPanel(); virtual ~LLFloaterIMPanel();
void lookupName(); void lookupName();
static void onAvatarNameLookup(const LLUUID&, const LLAvatarName& avatar_name, void* data);
/*virtual*/ BOOL postBuild(); /*virtual*/ BOOL postBuild();