summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-10-19 13:57:40 -0700
committerMerov Linden <merov@lindenlab.com>2012-10-19 13:57:40 -0700
commite6a7133ef1fa1760e0bfb53f5b14e7b6e76da0f5 (patch)
tree7548bd621cf5aa67e42320e5062e9dd1fb1aecd0
parentd840a60ecc9f7a9e1e9521dc63a79bc73267ed88 (diff)
CHUI-422 : Add invited non buddies to the initial set of speakers
-rw-r--r--indra/newview/llspeakers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 64477765e1..46fd8c1290 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -533,8 +533,8 @@ void LLSpeakerMgr::updateSpeakerList()
LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id);
for (uuid_vec_t::iterator it = session->mInitialTargetIDs.begin();it!=session->mInitialTargetIDs.end();++it)
{
- // We only add avatars that are on line
- if (LLAvatarTracker::instance().isBuddyOnline(*it))
+ // Allow to set buddies if they are on line. Allow any other avatar.
+ if (!LLAvatarTracker::instance().isBuddy(*it) || LLAvatarTracker::instance().isBuddyOnline(*it))
{
setSpeaker(*it, "", LLSpeaker::STATUS_VOICE_ACTIVE, LLSpeaker::SPEAKER_AGENT);
}