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

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-26 13:49:50 +01:00
parent 5e799b1f81 485ad8e645
commit 237f84cde0
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llfloateractivespeakers.cpp
View File

@@ -70,8 +70,6 @@ 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),
@@ -84,7 +82,8 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy
mType(type), mType(type),
mIsModerator(FALSE), mIsModerator(FALSE),
mModeratorMutedVoice(FALSE), mModeratorMutedVoice(FALSE),
mModeratorMutedText(FALSE) mModeratorMutedText(FALSE),
mNameRequested(false)
{ {
// Make sure we also get the display name if SLIM or some other external // Make sure we also get the display name if SLIM or some other external
// voice client is used and not whatever is provided. // voice client is used and not whatever is provided.
@@ -104,15 +103,14 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy
void LLSpeaker::lookupName() void LLSpeaker::lookupName()
{ {
LLAvatarNameCache::get(mID, boost::bind(&on_avatar_name_lookup, _1, _2, boost::ref(mDisplayName))); if(!mNameRequested)
{
// Also set the legacy name. We will need it to initiate a new mNameRequested = true;
// IM session. LLAvatarNameCache::get(mID, boost::bind(&LLSpeaker::onNameCache, this, _2));
gCacheName->getFullName(mID, mLegacyName); }
mLegacyName = LLCacheName::cleanFullName(mLegacyName);
} }
static void on_avatar_name_lookup(const LLUUID&, const LLAvatarName& avatar_name, std::string& mDisplayName) void LLSpeaker::onNameCache(const LLAvatarName& avatar_name)
{ {
LLAvatarNameCache::getPNSName(avatar_name, 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
@@ -120,6 +118,10 @@ static void on_avatar_name_lookup(const LLUUID&, const LLAvatarName& avatar_name
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
mDisplayName = RlvStrings::getAnonym(mDisplayName); mDisplayName = RlvStrings::getAnonym(mDisplayName);
// [/RLVa:KB] // [/RLVa:KB]
// Also set the legacy name. We will need it to initiate a new
// IM session.
mLegacyName = LLCacheName::cleanFullName(avatar_name.getLegacyName());
} }
LLSpeakerTextModerationEvent::LLSpeakerTextModerationEvent(LLSpeaker* source) LLSpeakerTextModerationEvent::LLSpeakerTextModerationEvent(LLSpeaker* source)
@@ -616,6 +618,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
&& selected_speakerp->mType != LLSpeaker::SPEAKER_EXTERNAL && selected_speakerp->mType != LLSpeaker::SPEAKER_EXTERNAL
// Ansariel: No, we don't want to mute Lindens with display names // Ansariel: No, we don't want to mute Lindens with display names
//&& !LLMuteList::getInstance()->isLinden(selected_speakerp->mDisplayName)); //&& !LLMuteList::getInstance()->isLinden(selected_speakerp->mDisplayName));
&& !selected_speakerp->mLegacyName.empty()
&& !LLMuteList::getInstance()->isLinden(selected_speakerp->mLegacyName)); && !LLMuteList::getInstance()->isLinden(selected_speakerp->mLegacyName));
} }
mVolumeSlider->setValue(gVoiceClient->getUserVolume(selected_id)); mVolumeSlider->setValue(gVoiceClient->getUserVolume(selected_id));
@@ -788,7 +791,7 @@ void LLPanelActiveSpeakers::onDoubleClickSpeaker(void* user_data)
LLPointer<LLSpeaker> speakerp = panelp->mSpeakerMgr->findSpeaker(speaker_id); LLPointer<LLSpeaker> speakerp = panelp->mSpeakerMgr->findSpeaker(speaker_id);
if (speaker_id != gAgent.getID() && speakerp.notNull()) if (speaker_id != gAgent.getID() && speakerp.notNull() && !speakerp->mLegacyName.empty())
{ {
// Changed for display name support // Changed for display name support
//gIMMgr->addSession(speakerp->mDisplayName, IM_NOTHING_SPECIAL, speaker_id); //gIMMgr->addSession(speakerp->mDisplayName, IM_NOTHING_SPECIAL, speaker_id);

6
indra/newview/llfloateractivespeakers.h
View File

@@ -39,7 +39,9 @@
#include "llvoiceclient.h" #include "llvoiceclient.h"
#include "llframetimer.h" #include "llframetimer.h"
#include "llevent.h" #include "llevent.h"
#include <list> #include <list>
#include <boost/signals2.hpp>
class LLScrollListCtrl; class LLScrollListCtrl;
class LLButton; class LLButton;
@@ -52,7 +54,7 @@ class LLCheckBoxCtrl;
// data for a given participant in a voice channel // data for a given participant in a voice channel
class LLSpeaker : public LLRefCount, public LLOldEvents::LLObservable, public LLHandleProvider<LLSpeaker> class LLSpeaker : public LLRefCount, public LLOldEvents::LLObservable, public LLHandleProvider<LLSpeaker>, public boost::signals2::trackable
{ {
public: public:
typedef enum e_speaker_type typedef enum e_speaker_type
@@ -76,6 +78,7 @@ public:
LLSpeaker(const LLUUID& id, const std::string& name = LLStringUtil::null, const ESpeakerType type = SPEAKER_AGENT); LLSpeaker(const LLUUID& id, const std::string& name = LLStringUtil::null, const ESpeakerType type = SPEAKER_AGENT);
~LLSpeaker() {}; ~LLSpeaker() {};
void lookupName(); void lookupName();
void onNameCache(const LLAvatarName& avatar_name);
ESpeakerStatus mStatus; // current activity status in speech group ESpeakerStatus mStatus; // current activity status in speech group
F32 mLastSpokeTime; // timestamp when this speaker last spoke F32 mLastSpokeTime; // timestamp when this speaker last spoke
@@ -92,6 +95,7 @@ public:
BOOL mModeratorMutedVoice; BOOL mModeratorMutedVoice;
BOOL mModeratorMutedText; BOOL mModeratorMutedText;
std::string mLegacyName; std::string mLegacyName;
bool mNameRequested;
}; };
class LLSpeakerTextModerationEvent : public LLOldEvents::LLEvent class LLSpeakerTextModerationEvent : public LLOldEvents::LLEvent