From 730b19bd904fe1f035b17e9f72cae8976a78f5a7 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 15 May 2015 11:25:47 +0200 Subject: [PATCH] Rename FS-specific LLParticipantList to FSParticipantList --- indra/newview/fsfloatervoicecontrols.cpp | 4 +- indra/newview/fsfloatervoicecontrols.h | 4 +- indra/newview/fspanelimcontrolpanel.cpp | 2 +- indra/newview/fspanelimcontrolpanel.h | 6 +- indra/newview/fsparticipantlist.cpp | 132 +++++++++++------------ indra/newview/fsparticipantlist.h | 42 ++++---- 6 files changed, 95 insertions(+), 95 deletions(-) diff --git a/indra/newview/fsfloatervoicecontrols.cpp b/indra/newview/fsfloatervoicecontrols.cpp index 4851510705..7b6e7cbe28 100644 --- a/indra/newview/fsfloatervoicecontrols.cpp +++ b/indra/newview/fsfloatervoicecontrols.cpp @@ -356,10 +356,10 @@ void FSFloaterVoiceControls::refreshParticipantList() if (!non_avatar_caller) { llassert(mParticipants == NULL); // check for possible memory leak - mParticipants = new LLParticipantList(mSpeakerManager, mAvatarList, true, mVoiceType != VC_GROUP_CHAT && mVoiceType != VC_AD_HOC_CHAT, false); + mParticipants = new FSParticipantList(mSpeakerManager, mAvatarList, true, mVoiceType != VC_GROUP_CHAT && mVoiceType != VC_AD_HOC_CHAT, false); mParticipants->setValidateSpeakerCallback(boost::bind(&FSFloaterVoiceControls::validateSpeaker, this, _1)); const U32 speaker_sort_order = gSavedSettings.getU32("SpeakerParticipantDefaultOrder"); - mParticipants->setSortOrder(LLParticipantList::EParticipantSortOrder(speaker_sort_order)); + mParticipants->setSortOrder(FSParticipantList::EParticipantSortOrder(speaker_sort_order)); if (LLLocalSpeakerMgr::getInstance() == mSpeakerManager) { diff --git a/indra/newview/fsfloatervoicecontrols.h b/indra/newview/fsfloatervoicecontrols.h index 31843b181f..5df12f4b2a 100644 --- a/indra/newview/fsfloatervoicecontrols.h +++ b/indra/newview/fsfloatervoicecontrols.h @@ -34,12 +34,12 @@ #include "llvoicechannel.h" #include "llvoiceclient.h" +class FSParticipantList; class LLAvatarList; class LLAvatarListItem; class LLAvatarName; class LLNonAvatarCaller; class LLOutputMonitorCtrl; -class LLParticipantList; class LLSpeakerMgr; class LLSpeakersDelayActionsStorage; class LLSliderCtrl; @@ -251,7 +251,7 @@ private: private: speaker_state_map_t mSpeakerStateMap; LLSpeakerMgr* mSpeakerManager; - LLParticipantList* mParticipants; + FSParticipantList* mParticipants; LLAvatarList* mAvatarList; LLNonAvatarCaller* mNonAvatarCaller; EVoiceControls mVoiceType; diff --git a/indra/newview/fspanelimcontrolpanel.cpp b/indra/newview/fspanelimcontrolpanel.cpp index 50cb7e2f63..ab18bccb25 100644 --- a/indra/newview/fspanelimcontrolpanel.cpp +++ b/indra/newview/fspanelimcontrolpanel.cpp @@ -72,7 +72,7 @@ void FSPanelGroupControlPanel::setSessionId(const LLUUID& session_id) if(!mParticipantList) { LLSpeakerMgr* speaker_manager = LLIMModel::getInstance()->getSpeakerManager(session_id); - mParticipantList = new LLParticipantList(speaker_manager, getChild("grp_speakers_list"), true,false); + mParticipantList = new FSParticipantList(speaker_manager, getChild("grp_speakers_list"), true,false); } } diff --git a/indra/newview/fspanelimcontrolpanel.h b/indra/newview/fspanelimcontrolpanel.h index d04a842ab3..6835384061 100644 --- a/indra/newview/fspanelimcontrolpanel.h +++ b/indra/newview/fspanelimcontrolpanel.h @@ -1,6 +1,6 @@ /** * @file fspanelimcontrolpanel.h - * @brief LLPanelIMControlPanel and related class definitions + * @brief FSPanelChatControlPanel and related class definitions * * $LicenseInfo:firstyear=2004&license=viewerlgpl$ * Second Life Viewer Source Code @@ -31,7 +31,7 @@ #include "llpanel.h" -class LLParticipantList; +class FSParticipantList; class FSPanelChatControlPanel : public LLPanel @@ -69,7 +69,7 @@ public: protected: LLUUID mGroupID; - LLParticipantList* mParticipantList; + FSParticipantList* mParticipantList; }; class FSPanelAdHocControlPanel : public FSPanelGroupControlPanel diff --git a/indra/newview/fsparticipantlist.cpp b/indra/newview/fsparticipantlist.cpp index bdfeb99729..9a01bc9f86 100644 --- a/indra/newview/fsparticipantlist.cpp +++ b/indra/newview/fsparticipantlist.cpp @@ -1,6 +1,6 @@ /** * @file fsparticipantlist.cpp - * @brief LLParticipantList intended to update view(LLAvatarList) according to incoming messages + * @brief FSParticipantList intended to update view(LLAvatarList) according to incoming messages * * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * Second Life Viewer Source Code @@ -41,7 +41,7 @@ #include "llviewermenu.h" #include "llvoiceclient.h" -//LLParticipantList retrieves add, clear and remove events and updates view accordingly +//FSParticipantList retrieves add, clear and remove events and updates view accordingly #if LL_MSVC #pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally #endif @@ -132,7 +132,7 @@ private: * In this case this speaker is created as avatar and will be recreated when it appears in * Avatar's Voice session. * - * @see LLParticipantList::onAvalineCallerFound() + * @see FSParticipantList::onAvalineCallerFound() */ void findAvalineCaller(const uuid_set_t& participant_uuids) { @@ -161,7 +161,7 @@ private: * This method implements a HUCK to notify subscribers that watched Avaline callers by class * are not anymore in the call. * - * @see LLParticipantList::onAvalineCallerRemoved() + * @see FSParticipantList::onAvalineCallerRemoved() */ void checkIfAvalineCallersExist(const uuid_set_t& participant_uuids) { @@ -199,7 +199,7 @@ private: uuid_set_t mAvalineCallers; }; -LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, +FSParticipantList::FSParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list, bool use_context_menu/* = true*/, bool exclude_agent /*= true*/, @@ -211,8 +211,8 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, mValidateSpeakerCallback(NULL) { - mAvalineUpdater = new LLAvalineUpdater(boost::bind(&LLParticipantList::onAvalineCallerFound, this, _1), - boost::bind(&LLParticipantList::onAvalineCallerRemoved, this, _1)); + mAvalineUpdater = new LLAvalineUpdater(boost::bind(&FSParticipantList::onAvalineCallerFound, this, _1), + boost::bind(&FSParticipantList::onAvalineCallerRemoved, this, _1)); mSpeakerAddListener = new SpeakerAddListener(*this); mSpeakerRemoveListener = new SpeakerRemoveListener(*this); @@ -228,14 +228,14 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, mAvatarList->setNoItemsCommentText(LLTrans::getString("LoadingData")); LL_DEBUGS("SpeakingIndicator") << "Set session for speaking indicators: " << mSpeakerMgr->getSessionID() << LL_ENDL; mAvatarList->setSessionID(mSpeakerMgr->getSessionID()); - mAvatarListDoubleClickConnection = mAvatarList->setItemDoubleClickCallback(boost::bind(&LLParticipantList::onAvatarListDoubleClicked, this, _1)); - mAvatarListRefreshConnection = mAvatarList->setRefreshCompleteCallback(boost::bind(&LLParticipantList::onAvatarListRefreshed, this, _1, _2)); + mAvatarListDoubleClickConnection = mAvatarList->setItemDoubleClickCallback(boost::bind(&FSParticipantList::onAvatarListDoubleClicked, this, _1)); + mAvatarListRefreshConnection = mAvatarList->setRefreshCompleteCallback(boost::bind(&FSParticipantList::onAvatarListRefreshed, this, _1, _2)); // Set onAvatarListDoubleClicked as default on_return action. - mAvatarListReturnConnection = mAvatarList->setReturnCallback(boost::bind(&LLParticipantList::onAvatarListDoubleClicked, this, mAvatarList)); + mAvatarListReturnConnection = mAvatarList->setReturnCallback(boost::bind(&FSParticipantList::onAvatarListDoubleClicked, this, mAvatarList)); if (use_context_menu) { - mParticipantListMenu = new LLParticipantListMenu(*this); + mParticipantListMenu = new FSParticipantListMenu(*this); mAvatarList->setContextMenu(mParticipantListMenu); } else @@ -270,7 +270,7 @@ LLParticipantList::LLParticipantList(LLSpeakerMgr* data_source, sort(); } -LLParticipantList::~LLParticipantList() +FSParticipantList::~FSParticipantList() { mAvatarListDoubleClickConnection.disconnect(); mAvatarListRefreshConnection.disconnect(); @@ -297,12 +297,12 @@ LLParticipantList::~LLParticipantList() delete mAvalineUpdater; } -void LLParticipantList::setSpeakingIndicatorsVisible(BOOL visible) +void FSParticipantList::setSpeakingIndicatorsVisible(BOOL visible) { mAvatarList->setSpeakingIndicatorsVisible(visible); }; -void LLParticipantList::onAvatarListDoubleClicked(LLUICtrl* ctrl) +void FSParticipantList::onAvatarListDoubleClicked(LLUICtrl* ctrl) { LLAvatarListItem* item = dynamic_cast(ctrl); if(!item) @@ -318,7 +318,7 @@ void LLParticipantList::onAvatarListDoubleClicked(LLUICtrl* ctrl) LLAvatarActions::startIM(clicked_id); } -void LLParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param) +void FSParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param) { LLAvatarList* list = dynamic_cast(ctrl); if (list) @@ -413,7 +413,7 @@ void LLParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param) Probably Avaline caller should be removed from the LLSpeakerMgr list ONLY if it ends call itself. Asked in EXT-4301. */ -void LLParticipantList::onAvalineCallerFound(const LLUUID& participant_id) +void FSParticipantList::onAvalineCallerFound(const LLUUID& participant_id) { LLPanel* item = mAvatarList->getItemByValue(participant_id); @@ -444,14 +444,14 @@ void LLParticipantList::onAvalineCallerFound(const LLUUID& participant_id) addAvatarIDExceptAgent(participant_id); } -void LLParticipantList::onAvalineCallerRemoved(const LLUUID& participant_id) +void FSParticipantList::onAvalineCallerRemoved(const LLUUID& participant_id) { LL_DEBUGS("Avaline") << "Removing avaline caller from the list: " << participant_id << LL_ENDL; mSpeakerMgr->removeAvalineSpeaker(participant_id); } -void LLParticipantList::setSortOrder(EParticipantSortOrder order) +void FSParticipantList::setSortOrder(EParticipantSortOrder order) { const U32 speaker_sort_order = gSavedSettings.getU32("SpeakerParticipantDefaultOrder"); @@ -462,18 +462,18 @@ void LLParticipantList::setSortOrder(EParticipantSortOrder order) } } -const LLParticipantList::EParticipantSortOrder LLParticipantList::getSortOrder() const +const FSParticipantList::EParticipantSortOrder FSParticipantList::getSortOrder() const { const U32 speaker_sort_order = gSavedSettings.getU32("SpeakerParticipantDefaultOrder"); return EParticipantSortOrder(speaker_sort_order); } -void LLParticipantList::setValidateSpeakerCallback(validate_speaker_callback_t cb) +void FSParticipantList::setValidateSpeakerCallback(validate_speaker_callback_t cb) { mValidateSpeakerCallback = cb; } -void LLParticipantList::update() +void FSParticipantList::update() { mSpeakerMgr->update(true); @@ -484,14 +484,14 @@ void LLParticipantList::update() } } -bool LLParticipantList::isHovered() +bool FSParticipantList::isHovered() { S32 x, y; LLUI::getMousePositionScreen(&x, &y); return mAvatarList->calcScreenRect().pointInRect(x, y); } -bool LLParticipantList::onAddItemEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::onAddItemEvent(LLPointer event, const LLSD& userdata) { LLUUID uu_id = event->getValue().asUUID(); @@ -505,7 +505,7 @@ bool LLParticipantList::onAddItemEvent(LLPointer event, co return true; } -bool LLParticipantList::onRemoveItemEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::onRemoveItemEvent(LLPointer event, const LLSD& userdata) { uuid_vec_t& group_members = mAvatarList->getIDs(); uuid_vec_t::iterator pos = std::find(group_members.begin(), group_members.end(), event->getValue().asUUID()); @@ -517,7 +517,7 @@ bool LLParticipantList::onRemoveItemEvent(LLPointer event, return true; } -bool LLParticipantList::onClearListEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::onClearListEvent(LLPointer event, const LLSD& userdata) { uuid_vec_t& group_members = mAvatarList->getIDs(); group_members.clear(); @@ -525,7 +525,7 @@ bool LLParticipantList::onClearListEvent(LLPointer event, return true; } -bool LLParticipantList::onModeratorUpdateEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::onModeratorUpdateEvent(LLPointer event, const LLSD& userdata) { const LLSD& evt_data = event->getValue(); if ( evt_data.has("id") && evt_data.has("is_moderator") ) @@ -553,7 +553,7 @@ bool LLParticipantList::onModeratorUpdateEvent(LLPointer e return true; } -bool LLParticipantList::onSpeakerMuteEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::onSpeakerMuteEvent(LLPointer event, const LLSD& userdata) { LLPointer speakerp = (LLSpeaker*)event->getSource(); if (speakerp.isNull()) return false; @@ -566,7 +566,7 @@ bool LLParticipantList::onSpeakerMuteEvent(LLPointer event return true; } -void LLParticipantList::sort() +void FSParticipantList::sort() { if ( !mAvatarList ) return; @@ -597,7 +597,7 @@ void LLParticipantList::sort() } } -void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) +void FSParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) { if (mExcludeAgent && gAgent.getID() == avatar_id) return; if (mAvatarList->contains(avatar_id)) return; @@ -618,7 +618,7 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) adjustParticipant(avatar_id); } -void LLParticipantList::adjustParticipant(const LLUUID& speaker_id) +void FSParticipantList::adjustParticipant(const LLUUID& speaker_id) { LLPointer speakerp = mSpeakerMgr->findSpeaker(speaker_id); if (speakerp.isNull()) return; @@ -628,9 +628,9 @@ void LLParticipantList::adjustParticipant(const LLUUID& speaker_id) } // -// LLParticipantList::SpeakerAddListener +// FSParticipantList::SpeakerAddListener // -bool LLParticipantList::SpeakerAddListener::handleEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::SpeakerAddListener::handleEvent(LLPointer event, const LLSD& userdata) { /** * We need to filter speaking objects. These objects shouldn't appear in the list @@ -646,43 +646,43 @@ bool LLParticipantList::SpeakerAddListener::handleEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::SpeakerRemoveListener::handleEvent(LLPointer event, const LLSD& userdata) { return mParent.onRemoveItemEvent(event, userdata); } // -// LLParticipantList::SpeakerClearListener +// FSParticipantList::SpeakerClearListener // -bool LLParticipantList::SpeakerClearListener::handleEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::SpeakerClearListener::handleEvent(LLPointer event, const LLSD& userdata) { return mParent.onClearListEvent(event, userdata); } // -// LLParticipantList::SpeakerModeratorListener +// FSParticipantList::SpeakerModeratorListener // -bool LLParticipantList::SpeakerModeratorUpdateListener::handleEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::SpeakerModeratorUpdateListener::handleEvent(LLPointer event, const LLSD& userdata) { return mParent.onModeratorUpdateEvent(event, userdata); } -bool LLParticipantList::SpeakerMuteListener::handleEvent(LLPointer event, const LLSD& userdata) +bool FSParticipantList::SpeakerMuteListener::handleEvent(LLPointer event, const LLSD& userdata) { return mParent.onSpeakerMuteEvent(event, userdata); } -LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu() +LLContextMenu* FSParticipantList::FSParticipantListMenu::createMenu() { // set up the callbacks for all of the avatar menu items LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar; LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar; - registrar.add("ParticipantList.Sort", boost::bind(&LLParticipantList::LLParticipantListMenu::sortParticipantList, this, _2)); - registrar.add("ParticipantList.ToggleAllowTextChat", boost::bind(&LLParticipantList::LLParticipantListMenu::toggleAllowTextChat, this, _2)); - registrar.add("ParticipantList.ToggleMuteText", boost::bind(&LLParticipantList::LLParticipantListMenu::toggleMuteText, this, _2)); + registrar.add("ParticipantList.Sort", boost::bind(&FSParticipantList::FSParticipantListMenu::sortParticipantList, this, _2)); + registrar.add("ParticipantList.ToggleAllowTextChat", boost::bind(&FSParticipantList::FSParticipantListMenu::toggleAllowTextChat, this, _2)); + registrar.add("ParticipantList.ToggleMuteText", boost::bind(&FSParticipantList::FSParticipantListMenu::toggleMuteText, this, _2)); // [SL:KB] - Patch: Chat-GroupSessionEject | Checked: 2012-02-04 (Catznip-3.2.1) | Added: Catznip-3.2.1 registrar.add("ParticipantList.Eject", boost::bind(&LLGroupActions::ejectFromGroup, mParent.mSpeakerMgr->getSessionID(), mUUIDs.front())); // [SL:KB] @@ -690,18 +690,18 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu() registrar.add("Avatar.Profile", boost::bind(&LLAvatarActions::showProfile, mUUIDs.front())); registrar.add("Avatar.IM", boost::bind(&LLAvatarActions::startIM, mUUIDs.front())); registrar.add("Avatar.AddFriend", boost::bind(&LLAvatarActions::requestFriendshipDialog, mUUIDs.front())); - registrar.add("Avatar.BlockUnblock", boost::bind(&LLParticipantList::LLParticipantListMenu::toggleMuteVoice, this, _2)); + registrar.add("Avatar.BlockUnblock", boost::bind(&FSParticipantList::FSParticipantListMenu::toggleMuteVoice, this, _2)); registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::share, mUUIDs.front())); registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, mUUIDs.front())); registrar.add("Avatar.Call", boost::bind(&LLAvatarActions::startCall, mUUIDs.front())); - registrar.add("Avatar.AddToContactSet", boost::bind(&LLParticipantList::LLParticipantListMenu::handleAddToContactSet, this)); + registrar.add("Avatar.AddToContactSet", boost::bind(&FSParticipantList::FSParticipantListMenu::handleAddToContactSet, this)); registrar.add("Avatar.ZoomIn", boost::bind(&LLAvatarActions::zoomIn, mUUIDs.front())); - registrar.add("ParticipantList.ModerateVoice", boost::bind(&LLParticipantList::LLParticipantListMenu::moderateVoice, this, _2)); + registrar.add("ParticipantList.ModerateVoice", boost::bind(&FSParticipantList::FSParticipantListMenu::moderateVoice, this, _2)); - enable_registrar.add("ParticipantList.EnableItem", boost::bind(&LLParticipantList::LLParticipantListMenu::enableContextMenuItem, this, _2)); - enable_registrar.add("ParticipantList.EnableItem.Moderate", boost::bind(&LLParticipantList::LLParticipantListMenu::enableModerateContextMenuItem, this, _2)); - enable_registrar.add("ParticipantList.CheckItem", boost::bind(&LLParticipantList::LLParticipantListMenu::checkContextMenuItem, this, _2)); + enable_registrar.add("ParticipantList.EnableItem", boost::bind(&FSParticipantList::FSParticipantListMenu::enableContextMenuItem, this, _2)); + enable_registrar.add("ParticipantList.EnableItem.Moderate", boost::bind(&FSParticipantList::FSParticipantListMenu::enableModerateContextMenuItem, this, _2)); + enable_registrar.add("ParticipantList.CheckItem", boost::bind(&FSParticipantList::FSParticipantListMenu::checkContextMenuItem, this, _2)); // create the context menu from the XUI LLContextMenu* main_menu = createFromFile("menu_participant_list.xml"); @@ -722,7 +722,7 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu() return main_menu; } -void LLParticipantList::LLParticipantListMenu::show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y) +void FSParticipantList::FSParticipantListMenu::show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y) { if (uuids.size() == 0) return; @@ -741,7 +741,7 @@ void LLParticipantList::LLParticipantListMenu::show(LLView* spawning_view, const } } -void LLParticipantList::LLParticipantListMenu::sortParticipantList(const LLSD& userdata) +void FSParticipantList::FSParticipantListMenu::sortParticipantList(const LLSD& userdata) { std::string param = userdata.asString(); if ("sort_by_name" == param) @@ -754,7 +754,7 @@ void LLParticipantList::LLParticipantListMenu::sortParticipantList(const LLSD& u } } -void LLParticipantList::LLParticipantListMenu::toggleAllowTextChat(const LLSD& userdata) +void FSParticipantList::FSParticipantListMenu::toggleAllowTextChat(const LLSD& userdata) { LLIMSpeakerMgr* mgr = dynamic_cast(mParent.mSpeakerMgr); @@ -765,7 +765,7 @@ void LLParticipantList::LLParticipantListMenu::toggleAllowTextChat(const LLSD& u } } -void LLParticipantList::LLParticipantListMenu::toggleMute(const LLSD& userdata, U32 flags) +void FSParticipantList::FSParticipantListMenu::toggleMute(const LLSD& userdata, U32 flags) { const LLUUID speaker_id = mUUIDs.front(); BOOL is_muted = LLMuteList::getInstance()->isMuted(speaker_id, flags); @@ -809,17 +809,17 @@ void LLParticipantList::LLParticipantListMenu::toggleMute(const LLSD& userdata, } } -void LLParticipantList::LLParticipantListMenu::toggleMuteText(const LLSD& userdata) +void FSParticipantList::FSParticipantListMenu::toggleMuteText(const LLSD& userdata) { toggleMute(userdata, LLMute::flagTextChat); } -void LLParticipantList::LLParticipantListMenu::toggleMuteVoice(const LLSD& userdata) +void FSParticipantList::FSParticipantListMenu::toggleMuteVoice(const LLSD& userdata) { toggleMute(userdata, LLMute::flagVoiceChat); } -bool LLParticipantList::LLParticipantListMenu::isGroupModerator() +bool FSParticipantList::FSParticipantListMenu::isGroupModerator() { if (!mParent.mSpeakerMgr) { @@ -838,7 +838,7 @@ bool LLParticipantList::LLParticipantListMenu::isGroupModerator() return false; } -bool LLParticipantList::LLParticipantListMenu::isMuted(const LLUUID& avatar_id) +bool FSParticipantList::FSParticipantListMenu::isMuted(const LLUUID& avatar_id) { LLPointer selected_speakerp = mParent.mSpeakerMgr->findSpeaker(avatar_id); if (!selected_speakerp) return true; @@ -846,7 +846,7 @@ bool LLParticipantList::LLParticipantListMenu::isMuted(const LLUUID& avatar_id) return selected_speakerp->mStatus == LLSpeaker::STATUS_MUTED; } -void LLParticipantList::LLParticipantListMenu::moderateVoice(const LLSD& userdata) +void FSParticipantList::FSParticipantListMenu::moderateVoice(const LLSD& userdata) { if (!gAgent.getRegion()) return; @@ -865,7 +865,7 @@ void LLParticipantList::LLParticipantListMenu::moderateVoice(const LLSD& userdat } } -void LLParticipantList::LLParticipantListMenu::moderateVoiceParticipant(const LLUUID& avatar_id, bool unmute) +void FSParticipantList::FSParticipantListMenu::moderateVoiceParticipant(const LLUUID& avatar_id, bool unmute) { LLIMSpeakerMgr* mgr = dynamic_cast(mParent.mSpeakerMgr); if (mgr) @@ -874,7 +874,7 @@ void LLParticipantList::LLParticipantListMenu::moderateVoiceParticipant(const LL } } -void LLParticipantList::LLParticipantListMenu::moderateVoiceAllParticipants(bool unmute) +void FSParticipantList::FSParticipantListMenu::moderateVoiceAllParticipants(bool unmute) { LLIMSpeakerMgr* mgr = dynamic_cast(mParent.mSpeakerMgr); if (mgr) @@ -892,7 +892,7 @@ void LLParticipantList::LLParticipantListMenu::moderateVoiceAllParticipants(bool } // static -void LLParticipantList::LLParticipantListMenu::confirmMuteAllCallback(const LLSD& notification, const LLSD& response) +void FSParticipantList::FSParticipantListMenu::confirmMuteAllCallback(const LLSD& notification, const LLSD& response) { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); // if Cancel pressed @@ -915,7 +915,7 @@ void LLParticipantList::LLParticipantListMenu::confirmMuteAllCallback(const LLSD } -bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& userdata) +bool FSParticipantList::FSParticipantListMenu::enableContextMenuItem(const LLSD& userdata) { std::string item = userdata.asString(); const LLUUID& participant_id = mUUIDs.front(); @@ -977,7 +977,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& can_allow_text_chat can_moderate_voice */ -bool LLParticipantList::LLParticipantListMenu::enableModerateContextMenuItem(const LLSD& userdata) +bool FSParticipantList::FSParticipantListMenu::enableModerateContextMenuItem(const LLSD& userdata) { // only group moderators can perform actions related to this "enable callback" if (!isGroupModerator()) return false; @@ -1002,7 +1002,7 @@ bool LLParticipantList::LLParticipantListMenu::enableModerateContextMenuItem(con return true; } -bool LLParticipantList::LLParticipantListMenu::checkContextMenuItem(const LLSD& userdata) +bool FSParticipantList::FSParticipantListMenu::checkContextMenuItem(const LLSD& userdata) { std::string item = userdata.asString(); const LLUUID& id = mUUIDs.front(); @@ -1036,12 +1036,12 @@ bool LLParticipantList::LLParticipantListMenu::checkContextMenuItem(const LLSD& return false; } -void LLParticipantList::LLParticipantListMenu::handleAddToContactSet() +void FSParticipantList::FSParticipantListMenu::handleAddToContactSet() { LLAvatarActions::addToContactSet(mUUIDs); } -bool LLParticipantList::LLAvatarItemRecentSpeakerComparator::doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const +bool FSParticipantList::LLAvatarItemRecentSpeakerComparator::doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const { if (mParent.mSpeakerMgr) { diff --git a/indra/newview/fsparticipantlist.h b/indra/newview/fsparticipantlist.h index 39875a5195..46e0ac6cd4 100644 --- a/indra/newview/fsparticipantlist.h +++ b/indra/newview/fsparticipantlist.h @@ -1,6 +1,6 @@ /** * @file fsparticipantlist.h - * @brief LLParticipantList intended to update view(LLAvatarList) according to incoming messages + * @brief FSParticipantList intended to update view(LLAvatarList) according to incoming messages * * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * Second Life Viewer Source Code @@ -24,8 +24,8 @@ * $/LicenseInfo$ */ -#ifndef LL_PARTICIPANTLIST_H -#define LL_PARTICIPANTLIST_H +#ifndef FS_PARTICIPANTLIST_H +#define FS_PARTICIPANTLIST_H #include "llviewerprecompiledheaders.h" #include "llevent.h" @@ -37,19 +37,19 @@ class LLAvatarList; class LLUICtrl; class LLAvalineUpdater; -class LLParticipantList +class FSParticipantList { - LOG_CLASS(LLParticipantList); + LOG_CLASS(FSParticipantList); public: typedef boost::function validate_speaker_callback_t; - LLParticipantList(LLSpeakerMgr* data_source, + FSParticipantList(LLSpeakerMgr* data_source, LLAvatarList* avatar_list, bool use_context_menu = true, bool exclude_agent = true, bool can_toggle_icons = true); - ~LLParticipantList(); + ~FSParticipantList(); void setSpeakingIndicatorsVisible(BOOL visible); enum EParticipantSortOrder @@ -108,43 +108,43 @@ protected: class BaseSpeakerListener : public LLOldEvents::LLSimpleListener { public: - BaseSpeakerListener(LLParticipantList& parent) : mParent(parent) {} + BaseSpeakerListener(FSParticipantList& parent) : mParent(parent) {} protected: - LLParticipantList& mParent; + FSParticipantList& mParent; }; class SpeakerAddListener : public BaseSpeakerListener { public: - SpeakerAddListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {} + SpeakerAddListener(FSParticipantList& parent) : BaseSpeakerListener(parent) {} /*virtual*/ bool handleEvent(LLPointer event, const LLSD& userdata); }; class SpeakerRemoveListener : public BaseSpeakerListener { public: - SpeakerRemoveListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {} + SpeakerRemoveListener(FSParticipantList& parent) : BaseSpeakerListener(parent) {} /*virtual*/ bool handleEvent(LLPointer event, const LLSD& userdata); }; class SpeakerClearListener : public BaseSpeakerListener { public: - SpeakerClearListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {} + SpeakerClearListener(FSParticipantList& parent) : BaseSpeakerListener(parent) {} /*virtual*/ bool handleEvent(LLPointer event, const LLSD& userdata); }; class SpeakerModeratorUpdateListener : public BaseSpeakerListener { public: - SpeakerModeratorUpdateListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {} + SpeakerModeratorUpdateListener(FSParticipantList& parent) : BaseSpeakerListener(parent) {} /*virtual*/ bool handleEvent(LLPointer event, const LLSD& userdata); }; class SpeakerMuteListener : public BaseSpeakerListener { public: - SpeakerMuteListener(LLParticipantList& parent) : BaseSpeakerListener(parent) {} + SpeakerMuteListener(FSParticipantList& parent) : BaseSpeakerListener(parent) {} /*virtual*/ bool handleEvent(LLPointer event, const LLSD& userdata); }; @@ -152,14 +152,14 @@ protected: /** * Menu used in the participant list. */ - class LLParticipantListMenu : public LLListContextMenu + class FSParticipantListMenu : public LLListContextMenu { public: - LLParticipantListMenu(LLParticipantList& parent):mParent(parent){}; + FSParticipantListMenu(FSParticipantList& parent):mParent(parent){}; /*virtual*/ LLContextMenu* createMenu(); /*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y); protected: - LLParticipantList& mParent; + FSParticipantList& mParent; private: bool enableContextMenuItem(const LLSD& userdata); bool enableModerateContextMenuItem(const LLSD& userdata); @@ -231,12 +231,12 @@ protected: { LOG_CLASS(LLAvatarItemRecentSpeakerComparator); public: - LLAvatarItemRecentSpeakerComparator(LLParticipantList& parent):mParent(parent){}; + LLAvatarItemRecentSpeakerComparator(FSParticipantList& parent):mParent(parent){}; virtual ~LLAvatarItemRecentSpeakerComparator() {}; protected: virtual bool doCompare(const LLAvatarListItem* avatar_item1, const LLAvatarListItem* avatar_item2) const; private: - LLParticipantList& mParent; + FSParticipantList& mParent; }; private: @@ -267,7 +267,7 @@ private: LLPointer mSpeakerModeratorListener; LLPointer mSpeakerMuteListener; - LLParticipantListMenu* mParticipantListMenu; + FSParticipantListMenu* mParticipantListMenu; /** * This field manages an adding a new avatar_id in the mAvatarList @@ -287,4 +287,4 @@ private: LLAvalineUpdater* mAvalineUpdater; }; -#endif // LL_PARTICIPANTLIST_H +#endif // FS_PARTICIPANTLIST_H