[LLNameUI] Handle LFIDBearer::Type instead of jusst group or not

Removes "is_group" and switches it out for "type"
setValue no longer takes "group", instead it takes "type"
Constructors and setNameID now take Type instead of a boolean
setIsGroup is now setType

indra/llmessage/llavatarname.cpp

@@ -139,7 +139,7 @@ void LLAvatarName::fromString(const std::string& full_name)
 		mLegacyLastName = full_name.substr(index+1);
 		if (mLegacyLastName != "Resident")
 		{
-			mUsername = mLegacyFirstName + "." + mLegacyLastName;
+			mUsername = mLegacyFirstName + '.' + mLegacyLastName;
 			mDisplayName = full_name;
 			LLStringUtil::toLower(mUsername);
 		}
@@ -184,7 +184,7 @@ std::string LLAvatarName::getCompleteName(bool linefeed) const
 			name = mDisplayName;
 			if (sUseUsernames)
 			{
-				name += (linefeed ? "\n(" : " (") + mUsername + ")";
+				name += (linefeed ? "\n(" : " (") + mUsername + ')';
 			}
 		}
 	}
@@ -238,7 +238,7 @@ std::string LLAvatarName::getUserName() const
 	}
 	else
 	{
-		name = mLegacyFirstName + " " + mLegacyLastName;
+		name = mLegacyFirstName + ' ' + mLegacyLastName;
 	}
 	return name;
 }

indra/llmessage/llavatarname.h

@@ -94,7 +94,7 @@ public:
 		{
 			case 1 : return getCompleteName();
 			case 2 : return getDisplayName();
-			case 3 : return getLegacyName() + (mIsDisplayNameDefault ? "" : " (" + mDisplayName + ")"); break;
+			case 3 : return getLegacyName() + (mIsDisplayNameDefault ? "" : " (" + mDisplayName + ')'); break;
 			default : return getLegacyName();
 		}
 	}

indra/llui/lfidbearer.cpp

@@ -30,7 +30,8 @@ const std::array<const std::string, LFIDBearer::COUNT> LFIDBearer::sMenuStrings
 };
 std::array<LLMenuGL*, LFIDBearer::COUNT> LFIDBearer::sMenus {};
 
-LFIDBearer* LFIDBearer::sActive = nullptr;
+const LFIDBearer* LFIDBearer::sActive = nullptr;
+LFIDBearer::Type LFIDBearer::sActiveType = LFIDBearer::AVATAR;
 
 void LFIDBearer::buildMenus()
 {
@@ -49,7 +50,7 @@ LLMenuGL* LFIDBearer::showMenu(LLView* self, const std::string& menu_name, S32 x
 
 void LFIDBearer::showMenu(LLView* self, LLMenuGL* menu, S32 x, S32 y)
 {
-	sActive = this; // Menu listeners rely on this
+	setActive(); // Menu listeners rely on this
 	menu->buildDrawLabels();
 	menu->updateParent(LLMenuGL::sMenuContainer);
 	LLMenuGL::showPopup(self, menu, x, y);

indra/llui/lfidbearer.h

@@ -43,11 +43,18 @@ struct LFIDBearer
 	virtual S32 getNumSelected() const { return getStringUUIDSelectedItem().notNull(); }
 	virtual Type getSelectedType() const { return AVATAR; }
 
-	template<typename T> static T* getActive() { return static_cast<T*>(sActive); }
+	template<typename T> static const T* getActive() { return static_cast<const T*>(sActive); }
 	static LLUUID getActiveSelectedID() { return sActive->getStringUUIDSelectedItem(); }
 	static uuid_vec_t getActiveSelectedIDs() { return sActive->getSelectedIDs(); }
 	static S32 getActiveNumSelected() { return sActive->getNumSelected(); }
-	static Type getActiveType() { return sActive->getSelectedType(); }
+	static const Type& getActiveType() { return sActiveType; }
+
+	void setActive() const
+	{
+		sActive = this;
+		sActiveType = getSelectedType();
+		//sActiveIDs or even some kinda hybrid map, if Type is MULTIPLE fill the vals? and remove a buncha virtual functions?
+	}
 
 	static void buildMenus();
 	LLMenuGL* showMenu(LLView* self, const std::string& menu_name, S32 x, S32 y, std::function<void(LLMenuGL*)> on_menu_built = nullptr);
@@ -57,5 +64,8 @@ protected:
 	// Menus that recur, such as general avatars or groups menus
 	static const std::array<const std::string, COUNT> sMenuStrings;
 	static std::array<LLMenuGL*, COUNT> sMenus;
-	static LFIDBearer* sActive;
+
+private:
+	static const LFIDBearer* sActive;
+	static Type sActiveType;
 };

indra/llui/lleditmenuhandler.h

@@ -49,7 +49,7 @@ public:
 	virtual void	cut() {};
 	virtual BOOL	canCut() const { return FALSE; }
 	
-	virtual void	copy() {};
+	virtual void	copy() const {};
 	virtual BOOL	canCopy() const { return FALSE; }
 	
 	virtual void	paste() {};

indra/llui/lllineeditor.cpp

@@ -1119,7 +1119,7 @@ BOOL LLLineEditor::canCopy() const
 
 
 // copy selection to clipboard
-void LLLineEditor::copy()
+void LLLineEditor::copy() const
 {
 	if( canCopy() )
 	{

indra/llui/lllineeditor.h

@@ -107,7 +107,7 @@ public:
 	virtual void	cut();
 	virtual BOOL	canCut() const;
 
-	virtual void	copy();
+	void			copy() const override final;
 	virtual BOOL	canCopy() const;
 
 	virtual void	paste();

indra/llui/llscrolllistctrl.cpp

@@ -2874,7 +2874,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
 // LLEditMenuHandler functions
 
 // virtual
-void	LLScrollListCtrl::copy()
+void	LLScrollListCtrl::copy() const
 {
 	std::string buffer;
 	for (auto item : getAllSelected())

indra/llui/llscrolllistctrl.h

@@ -322,7 +322,7 @@ public:
 	virtual void		scrollToShowSelected();
 
 	// LLEditMenuHandler functions
-	virtual void	copy();
+	void			copy() const override final;
 	virtual BOOL	canCopy() const;
 	virtual void	cut();
 	virtual BOOL	canCut() const;

indra/llui/lltexteditor.cpp

@@ -2216,7 +2216,7 @@ BOOL LLTextEditor::canCopy() const
 }
 
 // copy selection to clipboard
-void LLTextEditor::copy(bool raw)
+void LLTextEditor::copy(bool raw) const
 {
 	if( !canCopy() )
 	{

indra/llui/lltexteditor.h

@@ -129,9 +129,9 @@ public:
 	virtual BOOL	canRedo() const;
 	virtual void	cut();
 	virtual BOOL	canCut() const;
-	void			copy(bool raw);
+	void			copy(bool raw) const;
-	void			copyRaw() { copy(true); }
+	void			copyRaw() const { copy(true); }
-	virtual void	copy() { copy(false); }
+	void			copy() const override final { copy(false); }
 	virtual BOOL	canCopy() const;
 	virtual void	paste();
 	virtual BOOL	canPaste() const;

indra/newview/app_settings/settings_ascent.xml

@@ -146,6 +146,28 @@
       <key>Value</key>
       <string>/resync</string>
     </map>
+    <key>AlchemyChatCommandSetChatChannel</key>
+    <map>
+      <key>Comment</key>
+      <string>Command to set nearby chat channel</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>/setchannel</string>
+    </map>
+    <key>AlchemyChatCommandSetHome</key>
+    <map>
+      <key>Comment</key>
+      <string>Command to set the avatar home</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>/sethome</string>
+    </map>
     <key>AlchemyConnectToNeighbors</key>
     <map>
       <key>Comment</key>
@@ -212,6 +234,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>AlchemyNearbyChatChannel</key>
+    <map>
+      <key>Comment</key>
+      <string>Chat channel used for sending nearby chat from the viewer</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>AlchemyRainbowEffects</key>
     <map>
       <key>Comment</key>
@@ -774,6 +807,17 @@
 			<key>Value</key>
 			<string>key2name</string>
 		</map>
+                <key>AscentCmdLineKeyToNameNameSystem</key>
+                <map>
+                  <key>Comment</key>
+		  <string>For key to name command defined by AscentCmdLineKeyToName, the format to show the key's name in. 0 = Old Style, 1 = Display Names and Username, 2 = Displayname only, 3 = Old Style (Display Name)</string>
+		  <key>Persist</key>
+		  <integer>1</integer>
+		  <key>Type</key>
+		  <string>S32</string>
+		  <key>Value</key>
+		  <integer>1</integer>
+                </map>
 		<key>AscentCmdLineOfferTp</key>
 		<map>
 			<key>Comment</key>

indra/newview/chatbar_as_cmdline.cpp

@@ -236,6 +236,7 @@ struct ProfCtrlListAccum : public LLControlGroup::ApplyFunctor
 #endif //PROF_CTRL_CALLS
 void spew_key_to_name(const LLUUID& targetKey, const LLAvatarName& av_name)
 {
+	static const LLCachedControl<S32> ns(gSavedSettings, "AscentCmdLineKeyToNameNameSystem");
 	cmdline_printchat(llformat("%s: %s", targetKey.asString().c_str(), av_name.getNSName().c_str()));
 }
 bool cmd_line_chat(std::string data, EChatType type)
@@ -255,12 +256,14 @@ bool cmd_line_chat(std::string data, EChatType type)
 		static LLCachedControl<std::string> sPosCommand(gSavedSettings,  "AscentCmdLinePos");
 		static LLCachedControl<std::string> sRezPlatCommand(gSavedSettings,  "AscentCmdLineRezPlatform");
 		static LLCachedControl<std::string> sHomeCommand(gSavedSettings,  "AscentCmdLineTeleportHome");
+		static LLCachedControl<std::string> sSetHomeCommand(gSavedSettings, "AlchemyChatCommandSetHome", "/sethome");
 		static LLCachedControl<std::string> sCalcCommand(gSavedSettings,  "AscentCmdLineCalc");
 		static LLCachedControl<std::string> sMapToCommand(gSavedSettings,  "AscentCmdLineMapTo");
 		static LLCachedControl<std::string> sClearCommand(gSavedSettings,  "AscentCmdLineClearChat");
 		static LLCachedControl<std::string> sRegionMsgCommand(gSavedSettings,  "SinguCmdLineRegionSay");
 		static LLCachedControl<std::string> sTeleportToCam(gSavedSettings,  "AscentCmdTeleportToCam");
 		static LLCachedControl<std::string> sHoverHeight(gSavedSettings, "AlchemyChatCommandHoverHeight", "/hover");
+		static LLCachedControl<std::string> sSetNearbyChatChannelCmd(gSavedSettings, "AlchemyChatCommandSetChatChannel", "/setchannel");
 		static LLCachedControl<std::string> sResyncAnimCommand(gSavedSettings, "AlchemyChatCommandResyncAnim", "/resync");
 		static LLCachedControl<std::string> sKeyToName(gSavedSettings,  "AscentCmdLineKeyToName");
 		static LLCachedControl<std::string> sOfferTp(gSavedSettings,  "AscentCmdLineOfferTp");
@@ -364,6 +367,11 @@ bool cmd_line_chat(std::string data, EChatType type)
 			gAgent.teleportHome();
 			return false;
 		}
+		else if (cmd == utf8str_tolower(sSetHomeCommand)) // sethome
+		{
+			gAgent.setStartPosition(START_LOCATION_ID_HOME);
+			return false;
+		}
 		else if (cmd == utf8str_tolower(sCalcCommand))//Cryogenic Blitz
 		{
 			if (data.length() > cmd.length() + 1)
@@ -447,6 +455,15 @@ bool cmd_line_chat(std::string data, EChatType type)
 			}
 			return false;
 		}
+		else if (cmd == utf8str_tolower(sSetNearbyChatChannelCmd)) // Set nearby chat channel
+		{
+			S32 chan;
+			if (input >> chan)
+			{
+				gSavedSettings.setS32("AlchemyNearbyChatChannel", chan);
+				return false;
+			}
+		}
 		else if (cmd == utf8str_tolower(sTeleportToCam))
 		{
 			gAgent.teleportViaLocation(gAgentCamera.getCameraPositionGlobal());

indra/newview/lffloaterinvpanel.cpp

@@ -67,6 +67,7 @@ LFFloaterInvPanel::LFFloaterInvPanel(const LLSD& cat, const std::string& name, L
 	mPanel->postBuild();
 	mPanel->setFollows(FOLLOWS_ALL);
 	mPanel->setEnabled(true);
+	mPanel->removeBorder();
 	addChild(mPanel);
 	removeChild(panel);
 }

indra/newview/llchatbar.cpp

@@ -72,6 +72,8 @@
 #include "chatbar_as_cmdline.h"
 
 // [RLVa:KB]
+#include "rlvcommon.h"
+#include "rlvactions.h"
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -100,25 +102,24 @@ class LLChatBarGestureObserver : public LLGestureManagerObserver
 {
 public:
 	LLChatBarGestureObserver(LLChatBar* chat_barp) : mChatBar(chat_barp){}
-	virtual ~LLChatBarGestureObserver() {}
+	virtual ~LLChatBarGestureObserver() = default;
-	virtual void changed() { mChatBar->refreshGestures(); }
+	void changed() override { mChatBar->refreshGestures(); }
 private:
 	LLChatBar* mChatBar;
 };
 
-
 //
 // Functions
 //
 
 LLChatBar::LLChatBar() 
 :	LLPanel(),
-	mInputEditor(NULL),
+	mInputEditor(nullptr),
 	mGestureLabelTimer(),
 	mLastSpecialChatChannel(0),
 	mIsBuilt(FALSE),
-	mGestureCombo(NULL),
+	mGestureCombo(nullptr),
-	mObserver(NULL)
+	mObserver(nullptr)
 {
 	setIsChrome(TRUE);
 	
@@ -132,10 +133,14 @@ LLChatBar::~LLChatBar()
 {
 	LLGestureMgr::instance().removeObserver(mObserver);
 	delete mObserver;
-	mObserver = NULL;
+	mObserver = nullptr;
 	// LLView destructor cleans up children
 }
 
+//-----------------------------------------------------------------------
+// Overrides
+//-----------------------------------------------------------------------
+
 BOOL LLChatBar::postBuild()
 {
 	if (LLUICtrl* history_ctrl = findChild<LLUICtrl>("History"))
@@ -189,7 +194,7 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
 		else if (mask == MASK_SHIFT)
 		{
 			// whisper
-			sendChat( CHAT_TYPE_WHISPER );
+			sendChat(CHAT_TYPE_WHISPER);
 			handled = TRUE;
 		}
 		else if (mask == MASK_NONE)
@@ -210,6 +215,11 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
 	return handled;
 }
 
+void LLChatBar::onFocusLost()
+{
+	stopChat();
+}
+
 void LLChatBar::refresh()
 {
 	// HACK: Leave the name of the gesture in place for a few seconds.
@@ -242,17 +252,16 @@ void LLChatBar::refreshGestures()
 		//store current selection so we can maintain it
 		std::string cur_gesture = mGestureCombo->getValue().asString();
 		mGestureCombo->selectFirstItem();
-		std::string label = mGestureCombo->getValue().asString();;
+
 		// clear
 		mGestureCombo->clearRows();
 
 		// collect list of unique gestures
 		std::map <std::string, BOOL> unique;
-		LLGestureMgr::item_map_t::const_iterator it;
 		const LLGestureMgr::item_map_t& active_gestures = LLGestureMgr::instance().getActiveGestures();
-		for (it = active_gestures.begin(); it != active_gestures.end(); ++it)
+		for (const auto& active_gesture : active_gestures)
 		{
-			LLMultiGesture* gesture = (*it).second;
+			LLMultiGesture* gesture = active_gesture.second;
 			if (gesture)
 			{
 				if (!gesture->mTrigger.empty())
@@ -262,11 +271,9 @@ void LLChatBar::refreshGestures()
 			}
 		}
 
-		// add unique gestures
+		for (auto& it2 : unique)
-		std::map <std::string, BOOL>::iterator it2;
-		for (it2 = unique.begin(); it2 != unique.end(); ++it2)
 		{
-			mGestureCombo->addSimpleElement((*it2).first);
+			mGestureCombo->addSimpleElement(it2.first);
 		}
 		
 		mGestureCombo->sortByName();
@@ -316,12 +323,12 @@ void LLChatBar::setIgnoreArrowKeys(BOOL b)
 	}
 }
 
-BOOL LLChatBar::inputEditorHasFocus()
+BOOL LLChatBar::inputEditorHasFocus() const
 {
 	return mInputEditor && mInputEditor->hasFocus();
 }
 
-std::string LLChatBar::getCurrentChat()
+std::string LLChatBar::getCurrentChat() const
 {
 	return mInputEditor ? mInputEditor->getText() : LLStringUtil::null;
 }
@@ -390,7 +397,7 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
 			pos++;
 		}
 		
-		mLastSpecialChatChannel = strtol(wstring_to_utf8str(channel_string).c_str(), NULL, 10);
+		mLastSpecialChatChannel = strtol(wstring_to_utf8str(channel_string).c_str(), nullptr, 10);
 		// <edit>
 		if(mesg[1] == '-')
 			mLastSpecialChatChannel = -mLastSpecialChatChannel;
@@ -570,9 +577,12 @@ void LLChatBar::onInputEditorKeystroke()
 
 	S32 length = raw_text.length();
 
-	//if( (length > 0) && (raw_text[0] != '/') )  // forward slash is used for escape (eg. emote) sequences
+//	if( (length > 0)
-// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+//	    && (raw_text[0] != '/')		// forward slash is used for escape (eg. emote) sequences
-	if ( (length > 0) && (raw_text[0] != '/') && (!gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
+//		    && (raw_text[0] != ':')	// colon is used in for MUD poses
+//	  )
+// [RLVa:KB] - Checked: 2010-03-26 (RLVa-1.2.0b) | Modified: RLVa-1.0.0d
+	if ( (length > 0) && (raw_text[0] != '/') && (raw_text[0] != ':') && (!RlvActions::hasBehaviour(RLV_BHVR_REDIRCHAT)) )
 // [/RLVa:KB]
 	{
 		gAgent.startTyping();
@@ -582,21 +592,6 @@ void LLChatBar::onInputEditorKeystroke()
 		gAgent.stopTyping();
 	}
 
-	/* Doesn't work -- can't tell the difference between a backspace
-	   that killed the selection vs. backspace at the end of line.
-	if (length > 1 
-		&& text[0] == '/'
-		&& key == KEY_BACKSPACE)
-	{
-		// the selection will already be deleted, but we need to trim
-		// off the character before
-		std::string new_text = raw_text.substr(0, length-1);
-		mInputEditor->setText( new_text );
-		mInputEditor->setCursorToEnd();
-		length = length - 1;
-	}
-	*/
-
 	KEY key = gKeyboard->currentKey();
 
 	// Ignore "special" keys, like backspace, arrows, etc.
@@ -622,11 +617,6 @@ void LLChatBar::onInputEditorKeystroke()
 				mInputEditor->setSelection(length, outlength);
 			}
 		}
-
-		//LL_INFOS() << "GESTUREDEBUG " << trigger 
-		//	<< " len " << length
-		//	<< " outlen " << out_str.getLength()
-		//	<< LL_ENDL;
 	}
 }
 
@@ -668,11 +658,11 @@ void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type,
 void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate)
 {
 	// Look for "/20 foo" channel chats.
-	S32 channel = 0;
+	S32 channel = gSavedSettings.getS32("AlchemyNearbyChatChannel");
 	LLWString out_text = stripChannelNumber(wtext, &channel);
 	std::string utf8_out_text = wstring_to_utf8str(out_text);
-
 	std::string utf8_text = wstring_to_utf8str(wtext);
+
 	utf8_text = utf8str_trim(utf8_text);
 	if (!utf8_text.empty())
 	{
@@ -680,17 +670,12 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 	}
 
 // [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.2.0b
-	if ( (0 == channel) && (rlv_handler_t::isEnabled()) )
+	// RELEASE-RLVa: [SL-2.0.0] This entire class appears to be dead/non-functional?
+	if ( (0 == channel) && (RlvActions::isRlvEnabled()) )
 	{
 		// Adjust the (public) chat "volume" on chat and gestures (also takes care of playing the proper animation)
-		if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATNORMAL)) )
+		type = RlvActions::checkChatVolume(type);
-			type = CHAT_TYPE_WHISPER;
+		animate &= !RlvActions::hasBehaviour( (!RlvUtil::isEmote(utf8_text)) ? RLV_BHVR_REDIRCHAT : RLV_BHVR_REDIREMOTE );
-		else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATSHOUT)) )
-			type = CHAT_TYPE_NORMAL;
-		else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
-			type = CHAT_TYPE_NORMAL;
-
-		animate &= !gRlvHandler.hasBehaviour( (!RlvUtil::isEmote(utf8_text)) ? RLV_BHVR_REDIRCHAT : RLV_BHVR_REDIREMOTE );
 	}
 // [/RLVa:KB]
 
@@ -731,23 +716,19 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 	send_chat_from_viewer(utf8_out_text, type, channel);
 }
 
-// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.2a
+//void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
+// [RLVa:KB] - Checked: 2010-02-27 (RLVa-1.2.0b) | Modified: RLVa-0.2.2a
 void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel)
 // [/RLVa:KB]
 {
 // [RLVa:KB] - Checked: 2010-02-27 (RLVa-1.2.0b) | Modified: RLVa-1.2.0a
 	// Only process chat messages (ie not CHAT_TYPE_START, CHAT_TYPE_STOP, etc)
-	if ( (rlv_handler_t::isEnabled()) && ( (CHAT_TYPE_WHISPER == type) || (CHAT_TYPE_NORMAL == type) || (CHAT_TYPE_SHOUT == type) ) )
+	if ( (RlvActions::isRlvEnabled()) && ( (CHAT_TYPE_WHISPER == type) || (CHAT_TYPE_NORMAL == type) || (CHAT_TYPE_SHOUT == type) ) )
 	{
 		if (0 == channel)
 		{
-			// (We already did this before, but LLChatHandler::handle() calls this directly)
+			// Clamp the volume of the chat if needed
-			if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATNORMAL)) )
+			type = RlvActions::checkChatVolume(type);
-				type = CHAT_TYPE_WHISPER;
-			else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATSHOUT)) )
-				type = CHAT_TYPE_NORMAL;
-			else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
-				type = CHAT_TYPE_NORMAL;
 
 			// Redirect chat if needed
 			if ( ( (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT) || (gRlvHandler.hasBehaviour(RLV_BHVR_REDIREMOTE)) ) && 
@@ -763,7 +744,7 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
 		else
 		{
 			// Don't allow chat on a non-public channel if sendchannel restricted (unless the channel is an exception)
-			if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHANNEL)) && (!gRlvHandler.isException(RLV_BHVR_SENDCHANNEL, channel)) )
+			if (!RlvActions::canSendChannel(channel))
 				return;
 
 			// Don't allow chat on debug channel if @sendchat, @redirchat or @rediremote restricted (shows as public chat on viewers)
@@ -836,33 +817,29 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
 void really_send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
 {
 	LLMessageSystem* msg = gMessageSystem;
-	// <edit>
+	if (channel >= 0)
-	if(channel >= 0)
 	{
-	// </edit>
+		msg->newMessageFast(_PREHASH_ChatFromViewer);
-	msg->newMessageFast(_PREHASH_ChatFromViewer);
+		msg->nextBlockFast(_PREHASH_AgentData);
-	msg->nextBlockFast(_PREHASH_AgentData);
+		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+		msg->nextBlockFast(_PREHASH_ChatData);
-	msg->nextBlockFast(_PREHASH_ChatData);
+		msg->addStringFast(_PREHASH_Message, utf8_out_text);
-	msg->addStringFast(_PREHASH_Message, utf8_out_text);
+		msg->addU8Fast(_PREHASH_Type, type);
-	msg->addU8Fast(_PREHASH_Type, type);
+		msg->addS32("Channel", channel);
-	msg->addS32("Channel", channel);
-	// <edit>
 	}
 	else
 	{
-		msg->newMessage("ScriptDialogReply");
+		msg->newMessageFast(_PREHASH_ScriptDialogReply);
-		msg->nextBlock("AgentData");
+		msg->nextBlockFast(_PREHASH_AgentData);
-		msg->addUUID("AgentID", gAgent.getID());
+		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-		msg->addUUID("SessionID", gAgent.getSessionID());
+		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-		msg->nextBlock("Data");
+		msg->nextBlockFast(_PREHASH_Data);
-		msg->addUUID("ObjectID", gAgent.getID());
+		msg->addUUIDFast(_PREHASH_ObjectID, gAgent.getID());
 		msg->addS32("ChatChannel", channel);
-		msg->addS32("ButtonIndex", 0);
+		msg->addS32Fast(_PREHASH_ButtonIndex, 0);
-		msg->addString("ButtonLabel", utf8_out_text);
+		msg->addStringFast(_PREHASH_ButtonLabel, utf8_out_text);
 	}
-	// </edit>
 	gAgent.sendReliableMessage();
 
 	LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
@@ -895,7 +872,7 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl)
 		}
 	}
 	mGestureLabelTimer.start();
-	if (mGestureCombo != NULL)
+	if (mGestureCombo != nullptr)
 	{
 		// free focus back to chat bar
 		mGestureCombo->setFocus(FALSE);
@@ -907,24 +884,39 @@ void toggleChatHistory()
 	LLFloaterChat::toggleInstance(LLSD());
 }
 
+//
+// LLChatCommandHandler
+//
 
-class LLChatHandler : public LLCommandHandler
+class LLChatCommandHandler final : public LLCommandHandler
 {
 public:
 	// not allowed from outside the app
-	LLChatHandler() : LLCommandHandler("chat",  UNTRUSTED_BLOCK) { }
+	LLChatCommandHandler() : LLCommandHandler("chat", UNTRUSTED_BLOCK) { }
 
     // Your code here
 	bool handle(const LLSD& tokens, const LLSD& query_map,
-				LLMediaCtrl* web)
+				LLMediaCtrl* web) override
 	{
-		if (tokens.size() < 2) return false;
+		bool retval = false;
-		S32 channel = tokens[0].asInteger();
+		// Need at least 2 tokens to have a valid message.
-		std::string mesg = tokens[1].asString();
+		if (tokens.size() < 2)
-		send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel);
+		{
-		return true;
+			retval = false;
+		}
+		else
+		{
+			S32 channel = tokens[0].asInteger();
+			{
+				retval = true;
+				// Send unescaped message, see EXT-6353.
+				std::string unescaped_mesg (LLURI::unescape(tokens[1].asString()));
+				send_chat_from_viewer(unescaped_mesg, CHAT_TYPE_NORMAL, channel);
+			}
+		}
+		return retval;
 	}
 };
 
 // Creating the object registers with the dispatcher.
-LLChatHandler gChatHandler;
+LLChatCommandHandler gChatHandler;

indra/newview/llchatbar.h

@@ -33,10 +33,9 @@
 #ifndef LL_LLCHATBAR_H
 #define LL_LLCHATBAR_H
 
-#include "llpanel.h"
 #include "llframetimer.h"
 #include "llchat.h"
-#include "lllayoutstack.h"
+#include "llpanel.h"
 
 class LLLineEditor;
 class LLMessageSystem;
@@ -46,17 +45,19 @@ class LLFrameTimer;
 class LLChatBarGestureObserver;
 class LLComboBox;
 
-class LLChatBar : public LLPanel
+
+class LLChatBar final
+:	public LLPanel
 {
 public:
 	// constructor for inline chat-bars (e.g. hosted in chat history window)
 	LLChatBar();
-	~LLChatBar();
-	virtual BOOL postBuild();
 
-	virtual BOOL handleKeyHere(KEY key, MASK mask);
+	BOOL		postBuild() override;
+	BOOL		handleKeyHere(KEY key, MASK mask) override;
+	void		onFocusLost() override;
 
-	void		refresh();
+	void		refresh() override;
 	void		refreshGestures();
 
 	// Move cursor into chat input field.
@@ -65,8 +66,8 @@ public:
 	// Ignore arrow keys for chat bar
 	void		setIgnoreArrowKeys(BOOL b);
 
-	BOOL		inputEditorHasFocus();
+	BOOL		inputEditorHasFocus() const;
-	std::string	getCurrentChat();
+	std::string	getCurrentChat() const;
 
 	// since chat bar logic is reused for chat history
 	// gesture combo box might not be a direct child
@@ -94,10 +95,11 @@ public:
 	static void stopChat();
 
 protected:
+	~LLChatBar();
+
 	void sendChat(EChatType type);
 	void updateChat();
 
-protected:
 	LLLineEditor*	mInputEditor;
 
 	LLFrameTimer	mGestureLabelTimer;

indra/newview/llcontrolavatar.cpp

@@ -325,6 +325,20 @@ void LLControlAvatar::markForDeath()
     mRootVolp = NULL;
 }
 
+void LLControlAvatar::markDead()
+{
+	// NOTE: this can happen when the control avatar and root volume are on different regions and we're
+		//       being called from the LLViewerRegion destructor due the region being dropped
+		//       (due to being used as a vehicle and the move not yet being processed?)
+	if (mRootVolp)
+	{
+		mRootVolp->unlinkControlAvatar();
+		mRootVolp = nullptr;
+	}
+
+	LLVOAvatar::markDead();
+}
+
 void LLControlAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
     if (mMarkedForDeath)
@@ -372,59 +386,62 @@ void LLControlAvatar::updateDebugText()
 
         for (auto volp : volumes)
         {
-            S32 verts = 0;
+            if (volp)
-            total_tris += volp->getTriangleCount(&verts);
-            total_verts += verts;
-            est_tris += volp->getEstTrianglesMax();
-            est_streaming_tris += volp->getEstTrianglesStreamingCost();
-            streaming_cost += volp->getStreamingCost();
-            lod_string += llformat("%d",volp->getLOD());
-            if (volp && volp->mDrawable)
             {
-                bool is_animated_flag = volp->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG;
+                S32 verts = 0;
-                if (is_animated_flag)
+                total_tris += volp->getTriangleCount(&verts);
+                total_verts += verts;
+                est_tris += volp->getEstTrianglesMax();
+                est_streaming_tris += volp->getEstTrianglesStreamingCost();
+                streaming_cost += volp->getStreamingCost();
+                lod_string += llformat("%d", volp->getLOD());
+                if (volp->mDrawable)
                 {
-                    animated_object_flag_string += "1";
+                    bool is_animated_flag = volp->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG;
+                    if (is_animated_flag)
+                    {
+                        animated_object_flag_string += "1";
+                    }
+                    else
+                    {
+                        animated_object_flag_string += "0";
+                    }
+                    if (volp->mDrawable->isActive())
+                    {
+                        active_string += "A";
+                    }
+                    else
+                    {
+                        active_string += "S";
+                    }
+                    if (volp->isRiggedMesh())
+                    {
+                        // Rigged/animatable mesh
+                        type_string += "R";
+                        lod_radius = volp->mLODRadius;
+                    }
+                    else if (volp->isMesh())
+                    {
+                        // Static mesh
+                        type_string += "M";
+                    }
+                    else
+                    {
+                        // Any other prim
+                        type_string += "P";
+                    }
+                    if (cam_dist_count < 4)
+                    {
+                        cam_dist_string += LLStringOps::getReadableNumber(volp->mLODDistance) + "/" +
+                            LLStringOps::getReadableNumber(volp->mLODAdjustedDistance) + " ";
+                        cam_dist_count++;
+                    }
                 }
                 else
                 {
-                    animated_object_flag_string += "0";
+                    active_string += "-";
+                    type_string += "-";
                 }
-                if (volp->mDrawable->isActive())
-                {
-                    active_string += "A";
-                }
-                else
-                {
-                    active_string += "S";
-                }
-                if (volp->isRiggedMesh())
-                {
-                    // Rigged/animatable mesh
-                    type_string += "R";
-                    lod_radius = volp->mLODRadius;
-                }
-                else if (volp->isMesh())
-                {
-                    // Static mesh
-                    type_string += "M";
-                }
-                else
-                {
-                    // Any other prim
-                    type_string += "P";
-                }
-                if (cam_dist_count < 4)
-                {
-                    cam_dist_string += LLStringOps::getReadableNumber(volp->mLODDistance) + "/" +
-                        LLStringOps::getReadableNumber(volp->mLODAdjustedDistance) + " ";
-                    cam_dist_count++;
-                }
-            }
-            else
-            {
-                active_string += "-";
-                type_string += "-";
             }
         }
         addDebugText(llformat("CAV obj %d anim %d active %s impost %d upprd %d strcst %f",
@@ -505,9 +522,10 @@ void LLControlAvatar::updateAnimations()
     {
         LLVOVolume *volp = *vol_it;
         //LL_INFOS("AnimatedObjects") << "updating anim for vol " << volp->getID() << " root " << mRootVolp->getID() << LL_ENDL;
-        signaled_animation_map_t& signaled_animations = LLObjectSignaledAnimationMap::instance().getMap()[volp->getID()];
+        auto& signaled_anim_map = LLObjectSignaledAnimationMap::instance().getMap();
-        for (auto anim_it = signaled_animations.begin();
+        signaled_animation_map_t& signaled_animations = signaled_anim_map[volp->getID()];
-             anim_it != signaled_animations.end();
+        for (auto anim_it = signaled_animations.begin(), anim_it_end = signaled_animations.end();
+             anim_it != anim_it_end;
              ++anim_it)
         {
             auto found_anim_it = anims.find(anim_it->first);

indra/newview/llcontrolavatar.h

@@ -52,6 +52,7 @@ public:
     // Delayed kill so we don't make graphics pipeline unhappy calling
     // markDead() inside other graphics pipeline operations.
     void markForDeath();
+    void markDead() override;
 
     void idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) override;
 	BOOL updateCharacter(LLAgent &agent) override;

indra/newview/llfloateravatarlist.cpp

@@ -322,6 +322,17 @@ bool is_nearby(const LLUUID& id)
 	return std::find(avatars.begin(), avatars.end(), id) != avatars.end();
 }
 
+const LLVector3d& get_av_pos(const LLUUID& id)
+{
+	if (const auto inst = LLFloaterAvatarList::getIfExists())
+		if (const auto av = inst->getAvatarEntry(id))
+			return av->getPosition();
+
+	LLWorld::pos_map_t avatars;
+	LLWorld::instance().getAvatars(&avatars);
+	return avatars[id];
+}
+
 void track_av(const LLUUID& id)
 {
 	if (auto inst = LLFloaterAvatarList::getIfExists())

indra/newview/llfloaterland.cpp

@@ -622,7 +622,7 @@ void LLPanelLandGeneral::refresh()
 		bool group_owned = parcel->getIsGroupOwned();
 
 		// Is it owned?
-		mTextOwner->setValue(is_public ? LLSD(LLUUID::null) : LLSD().with("id", owner_id).with("group", group_owned));
+		mTextOwner->setValue(is_public ? LLSD(LLUUID::null) : LLSD().with("id", owner_id).with("type", group_owned ? LFIDBearer::GROUP : LFIDBearer::AVATAR));
 		mTextGroup->setValue(is_public ? LLUUID::null : group_id);
 		if (is_public)
 		{
@@ -828,7 +828,7 @@ void LLPanelLandGeneral::refreshNames()
 	}
 
 	bool group_owned = parcel->getIsGroupOwned();
-	mTextOwner->setValue(LLSD().with("id", parcel->getOwnerID()).with("group", group_owned));
+	mTextOwner->setValue(LLSD().with("id", parcel->getOwnerID()).with("type", group_owned ? LFIDBearer::GROUP : LFIDBearer::AVATAR));
 	if (group_owned)
 	{
 		mTextOwner->setText(getString("group_owned_text"));

indra/newview/llfloatermap.h

@@ -58,6 +58,8 @@ public:
 // [/RLVa:KB]
 
 private:
+	friend class OverlayToggle;
+	friend class LLScaleMap;
 	LLFloaterMap(const LLSD& key = LLSD());
 	LLNetMap*		mPanelMap;
 };

indra/newview/llfolderview.cpp

@@ -1333,25 +1333,22 @@ BOOL LLFolderView::canCopy() const
 }
 
 // copy selected item
-void LLFolderView::copy()
+void LLFolderView::copy() const
 {
 	// *NOTE: total hack to clear the inventory clipboard
 	LLInventoryClipboard::instance().reset();
 	S32 count = mSelectedItems.size();
 	if(getVisible() && getEnabled() && (count > 0))
 	{
-		LLFolderViewEventListener* listener = NULL;
+		for (auto item : mSelectedItems)
-		selected_items_t::iterator item_it;
-		for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
 		{
-			listener = (*item_it)->getListener();
+			if(auto listener = item->getListener())
-			if(listener)
 			{
 				listener->copyToClipboard();
 			}
 		}
 	}
-	mSearchString.clear();
+	//mSearchString.clear(); // Singu Note: There's no good reason to clear out the jumpto item search string now, it'll time out anyway, let's remain const
 }
 
 BOOL LLFolderView::canCut() const

indra/newview/llfolderview.h

@@ -191,7 +191,7 @@ public:
 
 	// Copy & paste
 	virtual BOOL	canCopy() const;
-	virtual void	copy();
+	virtual void	copy() const override final;
 
 	virtual BOOL	canCut() const;
 	virtual void	cut();

indra/newview/llimpanel.cpp

@@ -1128,7 +1128,7 @@ void LLFloaterIMPanel::removeDynamicFocus()
 	findChild<LLComboBox>("instant_message_flyout")->remove(getString("focus"));
 }
 
-void copy_profile_uri(const LLUUID& id, LFIDBearer::Type type = LFIDBearer::AVATAR);
+void copy_profile_uri(const LLUUID& id, const LFIDBearer::Type& type = LFIDBearer::AVATAR);
 
 void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
 {

indra/newview/llnamebox.cpp

@@ -39,17 +39,17 @@ static LLRegisterWidget<LLNameBox> r("name_box");
 
 LLNameBox::LLNameBox(const std::string& name,
 	const LLUUID& name_id,
-	bool is_group,
+	const Type& type,
 	const std::string& loading,
 	bool rlv_sensitive,
 	const std::string& name_system)
-: LLNameUI(loading, rlv_sensitive, name_id, is_group, name_system)
+: LLNameUI(loading, rlv_sensitive, name_id, type, name_system)
 , LLTextBox(name, LLRect(), LLStringUtil::null, nullptr, TRUE)
 {
 	setClickedCallback(boost::bind(&LLNameUI::showProfile, this));
 	if (!name_id.isNull())
 	{
-		setNameID(name_id, is_group);
+		setNameID(name_id, type);
 	}
 	else setText(mInitialValue);
 }
@@ -104,8 +104,8 @@ LLXMLNodePtr LLNameBox::getXML(bool save_children) const
 // static
 LLView* LLNameBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-	bool is_group = false;
+	S8 type = AVATAR;
-	node->getAttribute_bool("is_group", is_group);
+	node->getAttributeS8("type", type);
 	LLUUID id;
 	node->getAttributeUUID("id", id);
 	std::string loading;
@@ -114,7 +114,7 @@ LLView* LLNameBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 	node->getAttribute_bool("rlv_sensitive", rlv_sensitive);
 	std::string name_system;
 	node->getAttributeString("name_system", name_system);
-	LLNameBox* name_box = new LLNameBox("name_box", id, is_group, loading, rlv_sensitive, name_system);
+	LLNameBox* name_box = new LLNameBox("name_box", id, (Type)type, loading, rlv_sensitive, name_system);
 	name_box->initFromXML(node,parent);
 
 	return name_box;

indra/newview/llnamebox.h

@@ -54,7 +54,7 @@ public:
 
 	LLNameBox(const std::string& name,
 		const LLUUID& name_id = LLUUID::null,
-		bool is_group = false,
+		const Type& type = AVATAR,
 		const std::string& loading = LLStringUtil::null,
 		bool rlv_sensitive = false,
 		const std::string& name_system = LLStringUtil::null);

indra/newview/llnameeditor.cpp

@@ -42,20 +42,20 @@ static LLRegisterWidget<LLNameEditor> r("name_editor");
 
 LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect,
 		const LLUUID& name_id,
-		bool is_group,
+		const Type& type,
 		const std::string& loading,
 		bool rlv_sensitive,
 		const std::string& name_system,
 		bool click_for_profile,
 		const LLFontGL* glfont,
 		S32 max_text_length)
-: LLNameUI(loading, rlv_sensitive, name_id, is_group, name_system)
+: LLNameUI(loading, rlv_sensitive, name_id, type, name_system)
 , LLLineEditor(name, rect, LLStringUtil::null, glfont, max_text_length)
 , mClickForProfile(click_for_profile)
 {
 	if (!name_id.isNull())
 	{
-		setNameID(name_id, is_group);
+		setNameID(name_id, type);
 	}
 	else setText(mInitialValue);
 }
@@ -83,10 +83,10 @@ BOOL LLNameEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	}
 	else // TODO: This is lazy, but I cannot recall a name editor that switches between group and avatar, so logic is not needed yet.
 	{
-		new_menu = mIsGroup ? "menu_nameeditor_group.xml" : "menu_nameeditor_avatar.xml";
+		new_menu = mType == GROUP ? "menu_nameeditor_group.xml" : "menu_nameeditor_avatar.xml";
 	}
 	if (!new_menu.empty()) setContextMenu(LLUICtrlFactory::instance().buildMenu(new_menu, LLMenuGL::sMenuContainer));
-	sActive = this;
+	setActive();
 
 	return LLLineEditor::handleRightMouseDown(x, y, mask);
 }
@@ -136,8 +136,8 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 
 	S32 max_text_length = 1024;
 	node->getAttributeS32("max_length", max_text_length);
-	bool is_group = false;
+	S8 type = AVATAR;
-	node->getAttribute_bool("is_group", is_group);
+	node->getAttributeS8("type", type);
 	LLUUID id;
 	node->getAttributeUUID("id", id);
 	std::string loading;
@@ -151,7 +151,7 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 
 	LLNameEditor* line_editor = new LLNameEditor("name_editor",
 								rect,
-								id, is_group, loading, rlv_sensitive, name_system,
+								id, (Type)type, loading, rlv_sensitive, name_system,
 								click_for_profile,
 								LLView::selectFont(node),
 								max_text_length);

indra/newview/llnameeditor.h

@@ -44,7 +44,7 @@ class LLNameEditor final
 public:
 	LLNameEditor(const std::string& name, const LLRect& rect,
 		const LLUUID& name_id = LLUUID::null,
-		bool is_group = false,
+		const Type& type = AVATAR,
 		const std::string& loading = LLStringUtil::null,
 		bool rlv_sensitive = false,
 		const std::string& name_system = LLStringUtil::null,

indra/newview/llnameui.cpp

@@ -46,35 +46,36 @@
 // statics
 std::set<LLNameUI*> LLNameUI::sInstances;
 
-LLNameUI::LLNameUI(const std::string& loading, bool rlv_sensitive, const LLUUID& id, bool is_group, const std::string& name_system)
+LLNameUI::LLNameUI(const std::string& loading, bool rlv_sensitive, const LLUUID& id, const Type& type, const std::string& name_system)
-: mNameID(id), mRLVSensitive(rlv_sensitive), mIsGroup(!is_group), mAllowInteract(false)
+: mNameID(id), mRLVSensitive(rlv_sensitive), mType(NONE), mAllowInteract(false)
 , mNameSystem(name_system.empty() ? "PhoenixNameSystem" : name_system), mInitialValue(!loading.empty() ? loading : LLTrans::getString("LoadingData"))
 {
-	setIsGroup(is_group);
+	setType(type);
 }
 
-void LLNameUI::setIsGroup(bool is_group)
+void LLNameUI::setType(const Type& type)
 {
 	// Disconnect active connections if needed
 	for (auto& connection : mConnections)
 		connection.disconnect();
 
-	if (mIsGroup != is_group)
+	if (mType != type)
 	{
-		if (mIsGroup = is_group)
+		if (type == GROUP)
 			sInstances.insert(this);
 		else
 		{
 			sInstances.erase(this);
 			mConnections[1] = gSavedSettings.getControl(mNameSystem)->getCommitSignal()->connect(boost::bind(&LLNameUI::setNameText, this));
 		}
+		mType = type;
 	}
 }
 
-void LLNameUI::setNameID(const LLUUID& name_id, bool is_group)
+void LLNameUI::setNameID(const LLUUID& name_id, const Type& type)
 {
 	mNameID = name_id;
-	setIsGroup(is_group);
+	setType(type);
 
 	if (mAllowInteract = mNameID.notNull())
 	{
@@ -82,7 +83,7 @@ void LLNameUI::setNameID(const LLUUID& name_id, bool is_group)
 	}
 	else
 	{
-		setText(LLTrans::getString(mIsGroup ? "GroupNameNone" : "AvatarNameNobody"));
+		setText(LLTrans::getString(mType == GROUP ? "GroupNameNone" : "AvatarNameNobody"));
 		displayAsLink(false);
 	}
 }
@@ -92,7 +93,7 @@ void LLNameUI::setNameText()
 	std::string name;
 	bool got_name = false;
 
-	if (mIsGroup)
+	if (mType == GROUP)
 	{
 		got_name = gCacheName->getGroupName(mNameID, name);
 	}
@@ -105,7 +106,7 @@ void LLNameUI::setNameText()
 			mConnections[0] = LLAvatarNameCache::get(mNameID, boost::bind(&LLNameUI::setNameText, this));
 	}
 
-	if (!mIsGroup && got_name && mRLVSensitive) // Filter if needed
+	if (mType == AVATAR && got_name && mRLVSensitive) // Filter if needed
 	{
 		if ((RlvActions::hasBehaviour(RLV_BHVR_SHOWNAMES) || RlvActions::hasBehaviour(RLV_BHVR_SHOWNAMETAGS))
 			&& mNameID != gAgentID && RlvUtil::isNearbyAgent(mNameID))
@@ -123,7 +124,7 @@ void LLNameUI::setNameText()
 	setText(got_name ? name : mInitialValue);
 }
 
-void LLNameUI::refresh(const LLUUID& id, const std::string& full_name, bool is_group)
+void LLNameUI::refresh(const LLUUID& id, const std::string& full_name)
 {
 	if (id == mNameID)
 	{
@@ -131,12 +132,11 @@ void LLNameUI::refresh(const LLUUID& id, const std::string& full_name, bool is_g
 	}
 }
 
-void LLNameUI::refreshAll(const LLUUID& id, const std::string& full_name, bool is_group)
+void LLNameUI::refreshAll(const LLUUID& id, const std::string& full_name)
 {
-	if (!is_group) return;
 	for (auto box : sInstances)
 	{
-		box->refresh(id, full_name, is_group);
+		box->refresh(id, full_name);
 	}
 }
 
@@ -144,8 +144,10 @@ void LLNameUI::showProfile()
 {
 	if (!mAllowInteract) return;
 
-	if (mIsGroup)
+	switch (LFIDBearer::getActiveType())
-		LLGroupActions::show(mNameID);
+	{
-	else
+	case LFIDBearer::GROUP: LLGroupActions::show(mNameID); break;
-		LLAvatarActions::showProfile(mNameID);
+	case LFIDBearer::AVATAR: LLAvatarActions::showProfile(mNameID); break;
+	default: break;
+	}
 }

indra/newview/llnameui.h

@@ -38,24 +38,23 @@
 
 struct LLNameUI : public LFIDBearer
 {
-	LLNameUI(const std::string& loading = LLStringUtil::null, bool rlv_sensitive = false, const LLUUID& id = LLUUID::null, bool is_group = false, const std::string& name_system = LLStringUtil::null);
+	LLNameUI(const std::string& loading = LLStringUtil::null, bool rlv_sensitive = false, const LLUUID& id = LLUUID::null, const Type& type = AVATAR, const std::string& name_system = LLStringUtil::null);
 	virtual ~LLNameUI()
 	{
-		if (mIsGroup)
+		if (mType == GROUP)	sInstances.erase(this);
-			sInstances.erase(this);
 		for (auto& connection : mConnections)
 			connection.disconnect();
 	}
 
 	LLUUID getStringUUIDSelectedItem() const override final { return mNameID; }
 	S32 getNumSelected() const override final { return 1; }
-	Type getSelectedType() const override final { return mIsGroup ? GROUP : AVATAR; }
+	Type getSelectedType() const override final { return mType; }
 
-	void setIsGroup(bool is_group);
+	void setType(const Type& type);
-	void setNameID(const LLUUID& name_id, bool is_group);
+	void setNameID(const LLUUID& name_id, const Type& type);
 	void setNameText(); // Sets the name to whatever the name cache has at the moment
-	void refresh(const LLUUID& id, const std::string& full_name, bool is_group);
+	void refresh(const LLUUID& id, const std::string& name);
-	static void refreshAll(const LLUUID& id, const std::string& full_name, bool is_group);
+	static void refreshAll(const LLUUID& id, const std::string& name);
 
 	void showProfile();
 
@@ -66,9 +65,9 @@ struct LLNameUI : public LFIDBearer
 	virtual void setValue(const LLSD& value)
 	{
 		if (value.has("id"))
-			setNameID(value["id"].asUUID(), value["group"].asBoolean());
+			setNameID(value["id"].asUUID(), (Type)value["type"].asInteger());
 		else
-			setNameID(value.asUUID(), mIsGroup);
+			setNameID(value.asUUID(), mType);
 	}
 	// Return agent UUIDs
 	virtual LLSD getValue() const { return LLSD(mNameID); }
@@ -80,7 +79,7 @@ private:
 protected:
 	LLUUID mNameID;
 	bool mRLVSensitive; // Whether or not we're doing RLV filtering
-	bool mIsGroup;
+	Type mType;
 	bool mAllowInteract;
 	std::string mInitialValue;
 	std::string mNameSystem;

indra/newview/llnetmap.cpp

@@ -53,6 +53,7 @@
 #include "llavatarnamecache.h"
 #include "llcallingcard.h"
 #include "llcolorscheme.h"
+#include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llframetimer.h"
 // [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
@@ -979,8 +980,6 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& tool_tip, LLRect* stick
 
 				LLVector3d myPosition = gAgent.getPositionGlobal();
 
-				std::map<LLUUID, LLVector3d>::iterator current = mClosestAgentsToCursor.begin();
-				std::map<LLUUID, LLVector3d>::iterator end = mClosestAgentsToCursor.end();
 				for (const auto& target : mClosestAgentsToCursor)
 				{
 					const auto& targetUUID = target.first;
@@ -1362,7 +1361,7 @@ BOOL LLNetMap::handleMouseUp( S32 x, S32 y, MASK mask )
 bool OverlayToggle::handleEvent(LLPointer<LLEvent> event, const LLSD& sdParam)
 {
 	// Force an overlay update
-	LFIDBearer::getActive<LLNetMap>()->mUpdateParcelImage = true;
+	LLFloaterMap::findInstance()->mPanelMap->mUpdateParcelImage = true;
 	return true;
 }
 // [/SL:KB]
@@ -1474,7 +1473,7 @@ BOOL LLNetMap::handleHover( S32 x, S32 y, MASK mask )
 // static
 bool LLScaleMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
-	LLNetMap *self = LFIDBearer::getActive<LLNetMap>();
+	auto self = LLFloaterMap::findInstance()->mPanelMap;
 
 	S32 level = userdata.asInteger();
 

indra/newview/llpanelavatar.cpp

@@ -1241,7 +1241,7 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id)
 		if (mAvatarID.notNull())
 			LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this);
 		mAvatarID = avatar_id;
-		getChild<LLNameEditor>("dnname")->setNameID(avatar_id, false);
+		getChild<LLNameEditor>("dnname")->setNameID(avatar_id, LFIDBearer::AVATAR);
 	}
 
 	if (avatar_id.isNull()) return;
@@ -1399,7 +1399,7 @@ void LLPanelAvatar::onClickCopy(const LLSD& val)
 	}
 	else
 	{
-		void copy_profile_uri(const LLUUID& id, LFIDBearer::Type type = LFIDBearer::AVATAR);
+		void copy_profile_uri(const LLUUID& id, const LFIDBearer::Type& type = LFIDBearer::AVATAR);
 		copy_profile_uri(mAvatarID);
 	}
 }

indra/newview/llpanelgroup.cpp

@@ -130,7 +130,7 @@ void LLPanelGroupTab::handleClickHelp()
 	}
 }
 
-void copy_profile_uri(const LLUUID& id, LFIDBearer::Type type);
+void copy_profile_uri(const LLUUID& id, const LFIDBearer::Type& type);
 
 LLPanelGroup::LLPanelGroup(const LLUUID& group_id)
 :	LLPanel("PanelGroup", LLRect(), FALSE),

indra/newview/llpanelmediasettingspermissions.cpp

@@ -101,15 +101,15 @@ void LLPanelMediaSettingsPermissions::draw()
 	{
 		if(mPermsGroupName)
 		{
-			mPermsGroupName->setNameID(group_id, true);
+			mPermsGroupName->setNameID(group_id, LFIDBearer::GROUP);
 		}
 	}
 	else
 	{
 		if(mPermsGroupName)
 		{
-			mPermsGroupName->setNameID(LLUUID::null, TRUE);
+			mPermsGroupName->setNameID(LLUUID::null, LFIDBearer::GROUP);
-			mPermsGroupName->refresh(LLUUID::null, std::string(), true);
+			mPermsGroupName->refresh(LLUUID::null, std::string());
 		}
 	}
 }

indra/newview/llpanelpermissions.cpp

@@ -445,7 +445,7 @@ void LLPanelPermissions::refresh()
 	{
 		if(mLabelGroupName)
 		{
-			mLabelGroupName->setNameID(group_id, TRUE);
+			mLabelGroupName->setNameID(group_id, LFIDBearer::GROUP);
 			mLabelGroupName->setEnabled(TRUE);
 		}
 	}
@@ -453,8 +453,8 @@ void LLPanelPermissions::refresh()
 	{
 		if(mLabelGroupName)
 		{
-			mLabelGroupName->setNameID(LLUUID::null, TRUE);
+			mLabelGroupName->setNameID(LLUUID::null, LFIDBearer::GROUP);
-			mLabelGroupName->refresh(LLUUID::null, std::string(), true);
+			mLabelGroupName->refresh(LLUUID::null, std::string());
 			mLabelGroupName->setEnabled(FALSE);
 		}
 	}
@@ -1016,7 +1016,7 @@ void LLPanelPermissions::cbGroupID(LLUUID group_id)
 {
 	if(mLabelGroupName)
 	{
-		mLabelGroupName->setNameID(group_id, TRUE);
+		mLabelGroupName->setNameID(group_id, LFIDBearer::GROUP);
 	}
 	LLSelectMgr::getInstance()->sendGroup(group_id);
 }

indra/newview/llstartup.cpp

@@ -319,7 +319,7 @@ void transition_back_to_login_panel(const std::string& emsg);
 
 void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group)
 {
-	LLNameUI::refreshAll(id, full_name, is_group);
+	LLNameUI::refreshAll(id, full_name);
 
 	// TODO: Actually be intelligent about the refresh.
 	// For now, just brute force refresh the dialogs.

indra/newview/lltoolpie.cpp

@@ -533,7 +533,7 @@ void LLToolPie::walkToClickedLocation()
 	mAutoPilotDestination->setDuration(3.f);
 	*/
 
-	handle_go_to();
+	handle_go_to(mPick.mPosGlobal);
 }
 
 // When we get object properties after left-clicking on an object
@@ -763,8 +763,7 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
 
 void LLToolPie::stopClickToWalk()
 {
-	mPick.mPosGlobal = gAgent.getPositionGlobal();
+	handle_go_to(gAgent.getPositionGlobal());
-	handle_go_to();
 	/* Singu TODO: llhudeffectblob
 	if(mAutoPilotDestination)
 	{

indra/newview/llviewermedia.cpp

@@ -3529,7 +3529,7 @@ LLViewerMediaImpl::canCut() const
 ////////////////////////////////////////////////////////////////////////////////
 // virtual
 void
-LLViewerMediaImpl::copy()
+LLViewerMediaImpl::copy() const
 {
 	LLPluginClassMedia* mMediaSource = getMediaPlugin();
 	if (mMediaSource)

indra/newview/llviewermedia.h

@@ -339,7 +339,7 @@ public:
 	/*virtual*/ void	cut() override;
 	/*virtual*/ BOOL	canCut() const override;
 
-	/*virtual*/ void	copy() override;
+	/*virtual*/ void	copy() const override final;
 	/*virtual*/ BOOL	canCopy() const override;
 
 	/*virtual*/ void	paste() override;

indra/newview/llviewermenu.cpp

@@ -2837,12 +2837,11 @@ class LLObjectPFLinksetsSelected : public view_listener_t
 
 // </edit>
 
-bool handle_go_to()
+void handle_go_to(const LLVector3d& pos)
 {
 	// try simulator autopilot
 	std::vector<std::string> strings;
 	std::string val;
-	LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
 	val = llformat("%.9g", pos.mdV[VX]);
 	strings.push_back(val);
 	val = llformat("%.9g", pos.mdV[VY]);
@@ -2868,14 +2867,14 @@ bool handle_go_to()
 
 	// Could be first use
 	LLFirstUse::useGoTo();
-	return true;
 }
 
 class LLGoToObject : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		return handle_go_to();
+		handle_go_to(LLToolPie::instance().getPick().mPosGlobal);
+		return true;
 	}
 };
 
@@ -9035,17 +9034,17 @@ template<typename T> T* get_focused()
 	return t;
 }
 
-const std::string get_slurl_for(const LLUUID& id, LFIDBearer::Type type)
+const std::string get_slurl_for(const LLUUID& id, const LFIDBearer::Type& type)
 {
 	return type == LFIDBearer::GROUP ? LLGroupActions::getSLURL(id) : LLAvatarActions::getSLURL(id);
 }
 
-const LLWString get_wslurl_for(const LLUUID& id, LFIDBearer::Type type)
+const LLWString get_wslurl_for(const LLUUID& id, const LFIDBearer::Type& type)
 {
 	return utf8str_to_wstring(get_slurl_for(id, type));
 }
 
-void copy_profile_uri(const LLUUID& id, LFIDBearer::Type type)
+void copy_profile_uri(const LLUUID& id, const LFIDBearer::Type& type)
 {
 	gViewerWindow->getWindow()->copyTextToClipboard(get_wslurl_for(id, type));
 }
@@ -9390,6 +9389,17 @@ class ListIsNearby : public view_listener_t
 	}
 };
 
+const LLVector3d& get_av_pos(const LLUUID& id);
+class ListGoTo : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		auto id = LFIDBearer::getActiveSelectedID();
+		handle_go_to(LFIDBearer::getActiveType() == LFIDBearer::AVATAR ? get_av_pos(id) : gObjectList.findObject(id)->getPositionGlobal());
+		return true;
+	}
+};
+
 void track_av(const LLUUID& id);
 class ListTrack : public view_listener_t
 {
@@ -9923,6 +9933,7 @@ void initialize_menus()
 	addMenu(new ListStartIM(), "List.StartIM");
 	addMenu(new ListAbuseReport(), "List.AbuseReport");
 	addMenu(new ListIsNearby, "List.IsNearby");
+	addMenu(new ListGoTo, "List.GoTo");
 	addMenu(new ListTrack, "List.Track");
 	addMenu(new ListEject(), "List.ParcelEject");
 	addMenu(new ListFreeze(), "List.Freeze");

indra/newview/llviewermenu.h

@@ -136,7 +136,7 @@ void handle_object_sit_or_stand();
 void handle_give_money_dialog();
 bool enable_pay_object();
 bool enable_buy_object();
-bool handle_go_to();
+void handle_go_to(const LLVector3d& pos);
 
 // Export to XML or Collada
 void handle_export_selected( void * );

indra/newview/llviewermessage.cpp

@@ -4882,9 +4882,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
 	if (!gLastVersionChannel.empty() && gSavedSettings.getBOOL("SGServerVersionChangedNotification"))
 	{
-		LLSD payload;
+		LLSD args;
-		payload["message"] = version_channel;
+		args["OLD_VERSION"] = gLastVersionChannel;
-		LLNotificationsUtil::add("ServerVersionChanged", LLSD(), payload);
+		args["NEW_VERSION"] = version_channel;
+		LLNotificationsUtil::add("ServerVersionChanged", args);
 	}
 
 	gLastVersionChannel = version_channel;

indra/newview/llviewernetwork.h

@@ -63,7 +63,7 @@ public:
 
 private:
 	//void parseCommandLineURIs();
-	bool mNameEditted;	// Set if the user edits/sets the First or Last name field.
+	bool mNameEditted = false;	// Set if the user edits/sets the First or Last name field.
 };
 
 

indra/newview/rlvactions.cpp

@@ -1,6 +1,6 @@
 /** 
  *
- * Copyright (c) 2009-2013, Kitty Barnett
+ * Copyright (c) 2009-2016, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
  * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
@@ -38,6 +38,13 @@ bool RlvActions::canReceiveIM(const LLUUID& idSender)
 		  ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) || (!gRlvHandler.isException(RLV_BHVR_RECVIMFROM, idSender)) ) );
 }
 
+bool RlvActions::canSendChannel(int nChannel)
+{
+	return
+		( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHANNEL)) || (gRlvHandler.isException(RLV_BHVR_SENDCHANNEL, nChannel)) ) /*&&
+		( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHANNELEXCEPT)) || (!gRlvHandler.isException(RLV_BHVR_SENDCHANNELEXCEPT, nChannel)) )*/;
+}
+
 // Checked: 2010-11-30 (RLVa-1.3.0)
 bool RlvActions::canSendIM(const LLUUID& idRecipient)
 {
@@ -62,29 +69,44 @@ bool RlvActions::canStartIM(const LLUUID& idRecipient)
 		  ( (!gRlvHandler.hasBehaviour(RLV_BHVR_STARTIMTO)) || (!gRlvHandler.isException(RLV_BHVR_STARTIMTO, idRecipient)) ) );
 }
 
+// Handles: @chatwhisper, @chatnormal and @chatshout
+EChatType RlvActions::checkChatVolume(EChatType chatType)
+{
+	// In vs Bhvr | whisper |  normal |  shout  | n+w     |   n+s   |  s+w   |  s+n+w  |
+	// ---------------------------------------------------------------------------------
+	// whisper    | normal  | -       | -       | normal  | -       | normal | normal  |
+	// normal     | -       | whisper | -       | whisper | whisper | -      | whisper |
+	// shout      | -       | whisper | normal  | whisper | whisper | normal | whisper |
+
+	RlvHandler& rlvHandler = gRlvHandler;
+	if ( ((CHAT_TYPE_SHOUT == chatType) || (CHAT_TYPE_NORMAL == chatType)) && (rlvHandler.hasBehaviour(RLV_BHVR_CHATNORMAL)) )
+		chatType = CHAT_TYPE_WHISPER;
+	else if ( (CHAT_TYPE_SHOUT == chatType) && (rlvHandler.hasBehaviour(RLV_BHVR_CHATSHOUT)) )
+		chatType = CHAT_TYPE_NORMAL;
+	else if ( (CHAT_TYPE_WHISPER == chatType) && (rlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
+		chatType = CHAT_TYPE_NORMAL;
+	return chatType;
+}
+
 // ============================================================================
 // Movement
 //
 
-// Checked: 2010-12-11 (RLVa-1.2.2)
 bool RlvActions::canAcceptTpOffer(const LLUUID& idSender)
 {
 	return ((!gRlvHandler.hasBehaviour(RLV_BHVR_TPLURE)) || (gRlvHandler.isException(RLV_BHVR_TPLURE, idSender))) && (canStand());
 }
 
-// Checked: 2013-11-08 (RLVa-1.4.9)
 bool RlvActions::autoAcceptTeleportOffer(const LLUUID& idSender)
 {
 	return ((idSender.notNull()) && (gRlvHandler.isException(RLV_BHVR_ACCEPTTP, idSender))) || (gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTTP));
 }
 
-// Checked: 2013-11-08 (RLVa-1.4.9)
 bool RlvActions::canAcceptTpRequest(const LLUUID& idSender)
 {
 	return (!gRlvHandler.hasBehaviour(RLV_BHVR_TPREQUEST)) || (gRlvHandler.isException(RLV_BHVR_TPREQUEST, idSender));
 }
 
-// Checked: 2013-11-08 (RLVa-1.4.9)
 bool RlvActions::autoAcceptTeleportRequest(const LLUUID& idRequester)
 {
 	return ((idRequester.notNull()) && (gRlvHandler.isException(RLV_BHVR_ACCEPTTPREQUEST, idRequester))) || (gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTTPREQUEST));

indra/newview/rlvactions.h

@@ -1,6 +1,6 @@
 /** 
  *
- * Copyright (c) 2009-2013, Kitty Barnett
+ * Copyright (c) 2009-2016, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
  * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
@@ -17,6 +17,7 @@
 #ifndef RLV_ACTIONS_H
 #define RLV_ACTIONS_H
 
+#include "llchat.h"
 #include "rlvdefines.h"
 
 // ============================================================================
@@ -34,6 +35,13 @@ public:
 	 */
 	static bool canReceiveIM(const LLUUID& idSender);
 
+	/*
+
+	/*
+	 * Returns true if the user is allowed to chat on the specified channel
+	 */
+	static bool canSendChannel(int nChannel);
+
 	/*
 	 * Returns true if the user is allowed to send IMs to the specified recipient (can be an avatar or a group)
 	 */
@@ -53,6 +61,11 @@ public:
 	static bool canShowName(EShowNamesContext eContext) { return (eContext < SNC_COUNT) ? !s_BlockNamesContexts[eContext] : false; }
 	static void setShowName(EShowNamesContext eContext, bool fShowName) { if ( (eContext < SNC_COUNT) && (isRlvEnabled()) ) { s_BlockNamesContexts[eContext] = !fShowName; } }
 
+	/*
+	 * Checks if the user is allowed to use the specified volume in (main) chat and returns the appropriate chat volume type
+	 */
+	static EChatType checkChatVolume(EChatType chatType);
+
 protected:
 	// Backwards logic so that we can initialize to 0 and it won't block when we forget to/don't check if RLVa is disabled
 	static bool s_BlockNamesContexts[SNC_COUNT];
@@ -108,7 +121,7 @@ public:
 	static bool hasBehaviour(ERlvBehaviour eBhvr);
 
 	/*
-	 * Returns true if a - P2P or group - IM session is open with the specified UUID.
+	 * Returns true if a - P2P or group - IM session is open with the specified UUID
 	 */
 	static bool hasOpenP2PSession(const LLUUID& idAgent);
 	static bool hasOpenGroupSession(const LLUUID& idGroup);

indra/newview/rlvhelper.cpp

@@ -210,6 +210,10 @@ RlvCommandOptionGeneric::RlvCommandOptionGeneric(const std::string& strOption):
 	m_fValid = true;
 }
 
+// ============================================================================
+// RlvCommandOption structures
+//
+
 // Checked: 2012-07-28 (RLVa-1.4.7)
 class RlvCommandOptionGetPathCallback
 {
@@ -269,6 +273,14 @@ RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd, getpa
 	{
 		getItemIDs(rlvCmdOption.getAttachmentPoint(), m_idItems);
 	}
+	else if (rlvCmdOption.isUUID())				// ... or it can specify a specific attachment
+	{
+		const LLViewerObject* pAttachObj = gObjectList.findObject(rlvCmdOption.getUUID());
+		if ( (pAttachObj) && (pAttachObj->isAttachment()) && (pAttachObj->permYouOwner()) )
+			m_idItems.push_back(pAttachObj->getAttachmentItemID());
+		else
+			m_fValid = false;
+	}
 	else if (rlvCmdOption.isEmpty())			// ... or it can be empty (in which case we act on the object that issued the command)
 	{
 		const LLViewerObject* pObj = gObjectList.findObject(rlvCmd.getObjectID());
@@ -434,9 +446,19 @@ bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, bool fStrictOnly) const
 
 bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption, bool fStrictOnly) const
 {
-	for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+	for (const RlvCommand& rlvCmd : m_Commands)
-		if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption() == strOption) && ((!fStrictOnly) || (itCmd->isStrict())) )
+	{
+		// The specified behaviour is contained within the current object if:
+		//   - the (parsed) behaviour matches
+		//   - the option matches (or we're checking for an empty option and the command was reference counted)
+		//   - we're not matching on strict (or it is a strict command)
+		if ( (rlvCmd.getBehaviourType() == eBehaviour) &&
+			 ( (rlvCmd.getOption() == strOption) /*|| ((strOption.empty()) && (rlvCmd.isRefCounted()))*/ ) &&
+			 ( (!fStrictOnly) ||(rlvCmd.isStrict()) ) )
+		{
 			return true;
+		}
+	}
 	return false;
 }
 

indra/newview/skins/default/xui/de/notifications.xml

@@ -2406,7 +2406,10 @@ Klicken Sie auf „Akzeptieren“, um dem Chat beizutreten, oder auf &
   <notification name="ThrottledSLURL">Mehrere SLurls wurden von einem nicht vertrauten Browser innerhalb einer kurzen Zeitspanne empfangen.
 Sie wurden aus Sicherheitsgr&#xFC;nden geblockt f&#xFC;r ein paar Minuten.<tag>Sicherheit</tag></notification>
 
-  <notification name="ServerVersionChanged">Die Region, die Sie betreten haben, verwendet eine andere Simulatorversion. Klicken Sie auf diese Nachricht, um weitere Informationen zu erhalten.</notification>
+  <notification name="ServerVersionChanged">Die Region, die Sie betreten haben, verwendet eine andere Simulatorversion.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
+  </notification>
      <notification name="ObjectMediaFailure">Server Fehler: Media update oder download fehlgeschlagen.
 '[ERROR]'<tag>fehlgeschlagen</tag><usetemplate name="okbutton" yestext="OK"/></notification>
 

indra/newview/skins/default/xui/en-us/floater_about_land.xml

@@ -78,7 +78,7 @@
 			<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
-			     mouse_opaque="true" name="GroupText" v_pad="0" is_group="true"/>
+			     mouse_opaque="true" name="GroupText" v_pad="0" type="1"/>
 			<button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
 			     halign="center" height="16" label="Set..." label_selected="Set..."
 			     left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />

indra/newview/skins/default/xui/en-us/floater_inv_panel.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="inventory panel floater" width="250" height="400" min_width="100" min_height="100" can_close="true" can_minimize="true" can_resize="true">
-  <filter_editor bottom="-36" follows="left|right|top" height="18" left="4" mouse_opaque="true" right="-4" name="inventory search editor" label="Type here to search">
+  <filter_editor bottom="-36" follows="left|right|top" height="18" left="3" mouse_opaque="true" right="-2" name="inventory search editor" label="Type here to search">
     <filter_editor.commit_callback function="InvPanel.Search"/>
   </filter_editor>
-  <panel name="placeholder_panel" follows="all" left="5" right="-5" bottom_delta="-360" height="358"/>
+  <panel name="placeholder_panel" follows="all" left="4" right="-3" bottom_delta="-362" height="360"/>
 </floater>

indra/newview/skins/default/xui/en-us/floater_tools.xml

@@ -497,7 +497,7 @@
 			    bottom="-126" 
 			    left_delta="78"
 			    name="Group Name Proxy"
-			    width="142" is_group="true"/>
+			    width="142" type="1"/>
 			<button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
 			    height="16" label="Set" label_selected="Set..." left_delta="142"
 			    mouse_opaque="true" name="button set group" scale_image="TRUE" width="30" />

indra/newview/skins/default/xui/en-us/menu_avs_list.xml

@@ -45,6 +45,11 @@
       <on_click function="List.InviteToGroup"/>
       <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
+    <menu_item_call label="Move To" name="Move To">
+      <on_click function="List.GoTo"/>
+      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.IsNearby"/>
+    </menu_item_call>
     <menu_item_call label="Offer Teleport" name="Offer Teleport">
       <on_click function="List.OfferTeleport"/>
       <on_enable function="List.EnableAnySelected"/>

indra/newview/skins/default/xui/en-us/menu_local_avs.xml

@@ -45,6 +45,10 @@
       <on_click function="List.InviteToGroup"/>
       <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
+    <menu_item_call label="Move To" name="Move To">
+      <on_click function="List.GoTo"/>
+      <on_enable function="List.EnableSingleSelected"/>
+    </menu_item_call>
     <menu_item_call label="Offer Teleport" name="Offer Teleport">
       <on_click function="List.OfferTeleport"/>
       <on_enable function="List.EnableAnySelected"/>

indra/newview/skins/default/xui/en-us/menu_radar.xml

@@ -45,6 +45,11 @@
       <on_click function="List.InviteToGroup"/>
       <on_visible function="List.EnableAnySelected"/>
     </menu_item_call>
+    <menu_item_call label="Move To" name="Move To">
+      <on_click function="List.GoTo"/>
+      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.IsNearby"/>
+    </menu_item_call>
     <menu_item_call label="Offer Teleport" name="Offer Teleport">
       <on_click function="List.OfferTeleport"/>
       <on_enable function="List.EnableAnySelected"/>
@@ -73,6 +78,10 @@
       <on_click function="List.CopyUUIDs"/>
       <on_enable function="List.EnableAnySelected"/>
     </menu_item_call>
+    <menu_item_call label="Copy Name" name="Copy Name">
+      <on_click function="List.CopyNames"/>
+      <on_enable function="List.EnableAnySelected"/>
+    </menu_item_call>
     <menu_item_call label="Copy SLURL" name="Copy SLURL">
       <on_click function="List.CopySLURL"/>
       <on_visible function="List.EnableSingleSelected"/>

indra/newview/skins/default/xui/en-us/menu_url_agent.xml

@@ -33,6 +33,11 @@
     <menu_item_call label="Invite To Group" name="Invite To Group">
       <on_click function="List.InviteToGroup"/>
     </menu_item_call>
+    <menu_item_call label="Move To" name="Move To">
+      <on_click function="List.GoTo"/>
+      <on_enable function="List.EnableSingleSelected"/>
+      <on_visible function="List.IsNearby"/>
+    </menu_item_call>
     <menu_item_call label="Offer Teleport" name="Offer Teleport">
       <on_click function="List.OfferTeleport"/>
     </menu_item_call>

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -11415,7 +11415,9 @@ The object you're attempting to restore in world is no copy, if you do not have
    name="ServerVersionChanged"
    priority="high"
    type="notifytip">
-The region you have entered is running a different simulator version. Click this message for details.
+The region you have entered is running a different simulator version.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
   </notification>
 
   <notification

indra/newview/skins/default/xui/en-us/panel_group_general.xml

@@ -22,7 +22,7 @@ Hover your mouse over the options for more help.
 	<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-20" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
-	     mouse_opaque="true" name="group_name" v_pad="0" is_group="true">
+	     mouse_opaque="true" name="group_name" v_pad="0" type="1">
 		Type your new group name here
 	</name_box>
 	<text font="SansSerifSmall" name="prepend_founded_by">

indra/newview/skins/default/xui/es/notifications.xml

@@ -6069,7 +6069,8 @@ Ingresa el dominio a añadir en la [LIST]:
 
 	<notification name="ServerVersionChanged">
 		La región en la que has entrado está utilizando una versión diferente del simulador.
-Pulsa en este mensaje para ver más detalles.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
 	</notification>
 	
 	<notification name="SGIncompleteAppearance">
@@ -6135,4 +6136,4 @@ Por favor, asegurate de que tu reporte no será un duplicado de uno ya existente
     <usetemplate ignoretext="Cuando se abra el navegador para ir al Issue Tracker de [SHORT_APP_NAME]" name="okcancelignore" notext="Cancelar" yestext="Ir a la Página"/>
 	</notification>	
 	
-</notifications>
+</notifications>

indra/newview/skins/default/xui/fr/notifications.xml

@@ -3697,6 +3697,8 @@ Une erreur est survenue pendant la connexion au chat vocal pour [VOICE_CHANNEL_N
 
 	<notification name="ServerVersionChanged">
 La région dans laquelle vous avez pénétré utilise une version de simulateur différente. C'est ballot, mais c'est la vie !
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
 	</notification>
 
 	<notification name="UnableToOpenCommandURL">

indra/newview/skins/default/xui/pt/notifications.xml

@@ -3962,6 +3962,8 @@ Mais detalhes no log.
 
 	<notification name="ServerVersionChanged">
 		A região em que você entrou está rodando uma versão diferente de simulador.
+Current simulator: [NEW_VERSION]
+Previous simulator: [OLD_VERSION]
 	</notification>
 	<notification name="MeshUploadPermError">
 		Erro ao solicitar permissões de upload de mesh.