diff options
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llimfloater.cpp | 68 | ||||
-rw-r--r-- | indra/newview/llimfloater.h | 6 |
2 files changed, 0 insertions, 74 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 8742460689..d9c201d856 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -220,7 +220,6 @@ void LLIMFloater::sendMsg(const std::string& msg) LLIMFloater::~LLIMFloater() { - mParticipantsListRefreshConnection.disconnect(); mVoiceChannelStateChangeConnection.disconnect(); if(LLVoiceClient::instanceExists()) { @@ -274,22 +273,6 @@ void LLIMFloater::initIMFloater() { std::string session_name(LLIMModel::instance().getName(mSessionID)); updateSessionName(session_name); - - // For ad hoc conferences we should update the title with participants names. - if ((IM_SESSION_INVITE == mDialog && !gAgent.isInGroup(mSessionID)) - || mDialog == IM_SESSION_CONFERENCE_START) - { - if (mParticipantsListRefreshConnection.connected()) - { - mParticipantsListRefreshConnection.disconnect(); - } - - // CHUI-441: We shouldn't have any avatar_list anymore... see floater_im_session.xml - // *TODO: Track and delete if not necessary anymore - LLAvatarList* avatar_list = getChild<LLAvatarList>("speakers_list"); - mParticipantsListRefreshConnection = avatar_list->setRefreshCompleteCallback( - boost::bind(&LLIMFloater::onParticipantsListChanged, this, _1)); - } } } @@ -526,57 +509,6 @@ void LLIMFloater::updateSessionName(const std::string& name) mTypingStart.setArg("[NAME]", name); } -void LLIMFloater::onParticipantsListChanged(LLUICtrl* ctrl) -{ - LLAvatarList* avatar_list = dynamic_cast<LLAvatarList*>(ctrl); - if (!avatar_list) - { - return; - } - - std::vector<LLSD> participants_uuids; - uuid_vec_t temp_uuids; // uuids vector for building the added participants' names string - LLUUID unfound_id; - - avatar_list->getValues(participants_uuids); - - // Check participants names in LLAvatarNameCache - for (std::vector<LLSD>::const_iterator it = participants_uuids.begin(); it != participants_uuids.end(); ++it) - { - const LLUUID& id = it->asUUID(); - LLAvatarName av_name; - if (!LLAvatarNameCache::get(id, &av_name)) - { - // Keep the first not found avatar id - if (unfound_id.isNull()) - { - unfound_id = id; - } - } - else - { - // Add the participant to the list of existing names - temp_uuids.push_back(id); - } - } - - if (temp_uuids.size() != 0) - { - // Build the session name and update it - std::string ui_title; - LLAvatarActions::buildResidentsString(temp_uuids, ui_title); - updateSessionName(ui_title); - } - - if (unfound_id.notNull()) - { - // If a name is not found in cache, request it and continue the process recursively - // until all ids are resolved into names. - LLAvatarNameCache::get(unfound_id, boost::bind(&LLIMFloater::onParticipantsListChanged, this, avatar_list)); - } -} - - //static LLIMFloater* LLIMFloater::show(const LLUUID& session_id) { diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index dba3a4bcbd..8a0a163678 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -141,10 +141,6 @@ private: // Update the window title and input field help text /*virtual*/ void updateSessionName(const std::string& name); - /// Updates the list of ad hoc conference participants - /// in an IM floater title. - void onParticipantsListChanged(LLUICtrl* ctrl); - bool dropPerson(LLUUID* person_id, bool drop); BOOL isInviteAllowed() const; @@ -196,8 +192,6 @@ private: // connection to voice channel state change signal boost::signals2::connection mVoiceChannelStateChangeConnection; - - boost::signals2::connection mParticipantsListRefreshConnection; }; #endif // LL_IMFLOATER_H |