From 3126e58f249b1cb02b0f5d58dffe78eabb66291e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 2 Mar 2013 00:28:06 +0100 Subject: [PATCH] More cleanup after SSB/RLVa merge --- indra/newview/llappviewer.cpp | 5 -- indra/newview/llfloaterpreference.cpp | 5 -- indra/newview/llglsandbox.cpp | 7 --- indra/newview/llimfloater.cpp | 50 ------------------- indra/newview/llinventoryfunctions.cpp | 7 --- indra/newview/llpanelpeople.cpp | 7 --- indra/newview/lltoolface.cpp | 9 ---- indra/newview/llviewerfloaterreg.cpp | 3 -- indra/newview/llviewermenu.cpp | 4 -- indra/newview/llviewermessage.cpp | 69 -------------------------- indra/newview/llworldmapview.cpp | 2 + 11 files changed, 2 insertions(+), 166 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 826b21b633..4da41586e8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -5463,11 +5463,6 @@ void LLAppViewer::disconnectViewer() // close inventory interface, close all windows LLFloaterInventory::cleanup(); -// [SL:KB] - Patch: Appearance-Misc | Checked: 2013-02-12 (Catznip-3.4) - // Destroying all objects below will trigger attachment detaching code and attempt to remove the COF links for them - LLAppearanceMgr::instance().setAttachmentInvLinkEnable(false); -// [/SL:KB] - // [SL:KB] - Patch: Appearance-Misc | Checked: 2013-02-12 (Catznip-3.4) // Destroying all objects below will trigger attachment detaching code and attempt to remove the COF links for them LLAppearanceMgr::instance().setAttachmentInvLinkEnable(false); diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 32d1e7723f..d04cedbb2e 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1436,11 +1436,6 @@ void LLFloaterPreference::refreshEnabledState() LLComboBox* ctrl_reflections = getChild("Reflections"); // Radio group "ReflectionDetailRadio" doesn't exist as of 20/11/2012 //LLRadioGroup* radio_reflection_detail = getChild("ReflectionDetailRadio"); - -// [RLVa:KB] - Checked: 2010-04-09 (RLVa-1.2.0e) | Modified: RLVa-1.2.0e - if (rlv_handler_t::isEnabled()) - childSetEnabled("busy_response", !gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)); -// [/RLVa:KB] // [RLVa:KB] - Checked: 2010-04-09 (RLVa-1.2.0e) | Modified: RLVa-1.2.0e if (rlv_handler_t::isEnabled()) diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 07d90f9132..3a44c5f929 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -258,13 +258,6 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask) continue; } -// [RLVa:KB] - Checked: 2010-11-29 (RLVa-1.3.0c) | Added: RLVa-1.3.0c - if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canEdit(vobjp)) ) - { - continue; - } -// [/RLVa:KB] - // [RLVa:KB] - Checked: 2010-11-29 (RLVa-1.3.0c) | Added: RLVa-1.3.0c if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canEdit(vobjp)) ) { diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 565909cb6b..1d107a8d17 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -303,56 +303,6 @@ void LLIMFloater::sendMsg() //utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1); // FIRE-787 -// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c - if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) ) - { - LLIMModel::LLIMSession* pIMSession = LLIMModel::instance().findIMSession(mSessionID); - RLV_ASSERT(pIMSession); - - bool fRlvFilter = !pIMSession; - if (pIMSession) - { - switch (pIMSession->mSessionType) - { - case LLIMModel::LLIMSession::P2P_SESSION: // One-on-one IM - fRlvFilter = !gRlvHandler.canSendIM(mOtherParticipantUUID); - break; - case LLIMModel::LLIMSession::GROUP_SESSION: // Group chat - fRlvFilter = !gRlvHandler.canSendIM(mSessionID); - break; - case LLIMModel::LLIMSession::ADHOC_SESSION: // Conference chat: allow if all participants can be sent an IM - { - if (!pIMSession->mSpeakers) - { - fRlvFilter = true; - break; - } - - LLSpeakerMgr::speaker_list_t speakers; - pIMSession->mSpeakers->getSpeakerList(&speakers, TRUE); - for (LLSpeakerMgr::speaker_list_t::const_iterator itSpeaker = speakers.begin(); - itSpeaker != speakers.end(); ++itSpeaker) - { - const LLSpeaker* pSpeaker = *itSpeaker; - if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.canSendIM(pSpeaker->mID)) ) - { - fRlvFilter = true; - break; - } - } - } - break; - default: - fRlvFilter = true; - break; - } - } - - if (fRlvFilter) - utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM); - } -// [/RLVa:KB] - // [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) ) { diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index fdebb6591a..17ef3a0c53 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -455,13 +455,6 @@ BOOL get_is_category_renameable(const LLInventoryModel* model, const LLUUID& id) return FALSE; } -// [RLVa:KB] - Checked: 2011-03-29 (RLVa-1.3.0g) | Modified: RLVa-1.3.0g - if ( (rlv_handler_t::isEnabled()) && (model == &gInventory) && (!RlvFolderLocks::instance().canRenameFolder(id)) ) - { - return FALSE; - } -// [/RLVa:KB] - // [RLVa:KB] - Checked: 2011-03-29 (RLVa-1.3.0g) | Modified: RLVa-1.3.0g if ( (rlv_handler_t::isEnabled()) && (model == &gInventory) && (!RlvFolderLocks::instance().canRenameFolder(id)) ) { diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 18b7be255d..b19bc82570 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -1699,13 +1699,6 @@ void LLPanelPeople::updateButtons() bool enable_calls = LLVoiceClient::getInstance()->isVoiceWorking() && LLVoiceClient::getInstance()->voiceEnabled(); -// [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.2a) | Modified: RLVa-1.2.0d - if ( (nearby_tab_active) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) - { - item_selected = multiple_selected = false; - } -// [/RLBa:KB] - // [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.2a) | Modified: RLVa-1.2.0d if ( (nearby_tab_active) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ) { diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index e4e6238484..b513d3a7fa 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -110,15 +110,6 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info) return; } -// [RLVa:KB] - Checked: 2010-11-29 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c - if ( (rlv_handler_t::isEnabled()) && - ( (!gRlvHandler.canEdit(hit_obj)) || - ((gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (!gRlvHandler.canTouch(hit_obj, pick_info.mObjectOffset))) ) ) - { - return; - } -// [/RLVa:KB] - // [RLVa:KB] - Checked: 2010-11-29 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c if ( (rlv_handler_t::isEnabled()) && ( (!gRlvHandler.canEdit(hit_obj)) || diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 2182fd5f00..23f8a0ebc1 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -143,9 +143,6 @@ // #include "llnearbychatbar.h" // Remove floating chat bar // *NOTE: Please add files in alphabetical order to keep merges easy. -// [RLVa:KB] - Checked: 2010-03-11 -#include "rlvfloaters.h" -// [/RLVa:KB] // ND: And for FS please put yours after this line, for easier merges too #include "ao.h" #include "floatermedialists.h" diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 94652c95b5..27e7bf683a 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -122,10 +122,6 @@ #include "llwindow.h" #include "llpathfindingmanager.h" #include "boost/unordered_map.hpp" -// [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a) -#include "rlvhandler.h" -#include "rlvlocks.h" -// [/RLVa:KB] // Firestorm includes // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index dccfb53d92..5ecef9c004 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3908,7 +3908,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) LLColor4 color(1.0f, 1.0f, 1.0f, 1.0f); LLUUID from_id; LLUUID owner_id; - BOOL is_owned_by_me = FALSE; LLViewerObject* chatter; msg->getString("ChatData", "FromName", from_name); @@ -4066,74 +4065,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) } // NaCl End -// [RLVa:KB] - Checked: 2010-04-23 (RLVa-1.2.0f) | Modified: RLVa-1.2.0f - if ( (rlv_handler_t::isEnabled()) && (CHAT_TYPE_START != chat.mChatType) && (CHAT_TYPE_STOP != chat.mChatType) ) - { - // NOTE: chatter can be NULL (may not have rezzed yet, or could be another avie's HUD attachment) - BOOL is_attachment = (chatter) ? chatter->isAttachment() : FALSE; - - // Filtering "rules": - // avatar => filter all avie text (unless it's this avie or they're an exemption) - // objects => filter everything except attachments this avie owns (never filter llOwnerSay chat) - if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) || - ( (CHAT_SOURCE_OBJECT == chat.mSourceType) && ((!is_owned_by_me) || (!is_attachment)) && - (CHAT_TYPE_OWNER != chat.mChatType) ) ) - { - bool fIsEmote = RlvUtil::isEmote(mesg); - if ((!fIsEmote) && - (((gRlvHandler.hasBehaviour(RLV_BHVR_RECVCHAT)) && (!gRlvHandler.isException(RLV_BHVR_RECVCHAT, from_id))) || - ((gRlvHandler.hasBehaviour(RLV_BHVR_RECVCHATFROM)) && (gRlvHandler.isException(RLV_BHVR_RECVCHATFROM, from_id))) )) - { - if ( (gRlvHandler.filterChat(mesg, false)) && (!gSavedSettings.getBOOL("RestrainedLoveShowEllipsis")) ) - return; - } - else if ((fIsEmote) && - (((gRlvHandler.hasBehaviour(RLV_BHVR_RECVEMOTE)) && (!gRlvHandler.isException(RLV_BHVR_RECVEMOTE, from_id))) || - ((gRlvHandler.hasBehaviour(RLV_BHVR_RECVEMOTEFROM)) && (gRlvHandler.isException(RLV_BHVR_RECVEMOTEFROM, from_id))) )) - { - if (!gSavedSettings.getBOOL("RestrainedLoveShowEllipsis")) - return; - mesg = "/me ..."; - } - } - - // Filtering "rules": - // avatar => filter only their name (unless it's this avie) - // other => filter everything - if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) - { - if (CHAT_SOURCE_AGENT != chat.mSourceType) - { - RlvUtil::filterNames(chat.mFromName); - } - else if (chat.mFromID != gAgent.getID()) - { - chat.mFromName = RlvStrings::getAnonym(chat.mFromName); - chat.mRlvNamesFiltered = TRUE; - } - } - - // Create an "objectim" URL for objects if we're either @shownames or @showloc restricted - // (we need to do this now because we won't be have enough information to do it later on) - if ( (CHAT_SOURCE_OBJECT == chat.mSourceType) && - ((gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))) ) - { - LLSD sdQuery; - sdQuery["name"] = chat.mFromName; - sdQuery["owner"] = owner_id; - - if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!is_owned_by_me) ) - sdQuery["rlv_shownames"] = true; - - const LLViewerRegion* pRegion = LLWorld::getInstance()->getRegionFromPosAgent(chat.mPosAgent); - if (pRegion) - sdQuery["slurl"] = LLSLURL(pRegion->getName(), chat.mPosAgent).getLocationString(); - - chat.mURL = LLSLURL("objectim", from_id, LLURI::mapToQueryString(sdQuery)).getSLURLString(); - } - } -// [/RLVa:KB] - // [RLVa:KB] - Checked: 2010-04-23 (RLVa-1.2.0f) | Modified: RLVa-1.2.0f if ( (rlv_handler_t::isEnabled()) && (CHAT_TYPE_START != chat.mChatType) && (CHAT_TYPE_STOP != chat.mChatType) ) { diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 4070dd91b7..e4b66acdbc 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -151,6 +151,8 @@ void LLWorldMapView::initClass() sStringsMap["loading"] = LLTrans::getString("texture_loading"); sStringsMap["offline"] = LLTrans::getString("worldmap_offline"); + // Missing translation for agent position + sStringsMap["agent_position"] = LLTrans::getString("worldmap_agent_position"); } // static