From 2450b435a730762add23570c262db2888b675a22 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 24 Jan 2014 21:41:56 -0500
Subject: [PATCH 01/25] Combine commonly created scroll list menus into single
 menus identified by menu_num instead of their menu_file

sScrollListMenus is an array such that it will hold more menus in the future, such as groups.
fmenu_file still exists and will still exhibit its old behavior if used.
---
 indra/llui/llscrolllistctrl.cpp                      | 12 +++++++++++-
 indra/newview/llviewermenu.cpp                       |  5 +++++
 .../skins/default/xui/en-us/floater_about_land.xml   |  4 ++--
 .../default/xui/en-us/floater_active_speakers.xml    |  2 +-
 .../skins/default/xui/en-us/floater_directory.xml    |  2 +-
 .../skins/default/xui/en-us/floater_directory2.xml   |  2 +-
 .../skins/default/xui/en-us/floater_directory3.xml   |  2 +-
 .../skins/default/xui/en-us/panel_friends.xml        |  2 +-
 .../skins/default/xui/en-us/panel_friends_horiz.xml  |  2 +-
 .../skins/default/xui/en-us/panel_group_general.xml  |  2 +-
 .../skins/default/xui/en-us/panel_group_roles.xml    |  6 +++---
 .../default/xui/en-us/panel_speaker_controls.xml     |  2 +-
 12 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index bae86672c..fb9383ecb 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -57,6 +57,8 @@
 
 static LLRegisterWidget<LLScrollListCtrl> r("scroll_list");
 
+LLMenuGL* sScrollListMenus[1] = {}; // List menus that recur, such as general avatars or groups menus
+
 // local structures & classes.
 struct SortScrollListItem
 {
@@ -2552,7 +2554,15 @@ void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
 		node->getAttribute_bool("mouse_wheel_opaque", mMouseWheelOpaque);
 	}
 
-	if (node->hasAttribute("menu_file"))
+	if (node->hasAttribute("menu_num"))
+	{
+		// Some scroll lists use common menus identified by number
+		// 0 is menu_avs_list.xml, 1 will be for groups, 2 could be for lists of objects
+		S32 menu_num;
+		node->getAttributeS32("menu_num", menu_num);
+		mPopupMenu = sScrollListMenus[menu_num];
+	}
+	else if (node->hasAttribute("menu_file"))
 	{
 		std::string menu_file;
 		node->getAttributeString("menu_file", menu_file);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ca85a2ac2..32e426544 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -239,6 +239,7 @@ extern BOOL gDebugTextEditorTips;
 extern BOOL gShowOverlayTitle;
 extern BOOL gOcclusionCull;
 extern AIHTTPView* gHttpView;
+extern LLMenuGL* sScrollListMenus[1];
 //
 // Globals
 //
@@ -781,6 +782,10 @@ void init_menus()
 
 	gMenuHolder->addChild(gLoginMenuBarView);
 
+	// Singu Note: Initialize common ScrollListMenus here
+	sScrollListMenus[0] = LLUICtrlFactory::getInstance()->buildMenu("menu_avs_list.xml", gMenuHolder);
+	//sScrollListMenus[1] = LLUICtrlFactory::getInstance()->buildMenu("menu_groups_list.xml"); // Singu TODO
+
 	LLView* ins = gMenuBarView->getChildView("insert_world", true, false);
 	ins->setVisible(false);
 	ins = gMenuBarView->getChildView("insert_agent", true, false);
diff --git a/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index fec011a1a..eac223645 100644
--- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -1383,7 +1383,7 @@ Select the thumbnail to choose a different texture.
 			     column_padding="0" draw_border="true" draw_heading="false" enabled="true"
 			     follows="top|bottom" heading_font="SansSerifSmall" heading_height="14"
 			     height="80" left="20" mouse_opaque="true" multi_select="true"
-			     name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_file="menu_avs_list.xml"/>
+			     name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0"/>
 			<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
 			     halign="center" height="16" label="Add..." label_selected="Add..."
 			     left_delta="5" mouse_opaque="true" name="add_allowed" scale_image="true"
@@ -1403,7 +1403,7 @@ Select the thumbnail to choose a different texture.
 			     follows="top|bottom" heading_font="SansSerifSmall"
 			     heading_height="14" height="80" left_delta="0" mouse_opaque="true"
 			     multi_select="true" name="BannedList"
-			     tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_file="menu_avs_list.xml"/>
+			     tool_tip="([LISTED] listed, [MAX] max)" width="195" menu_num="0"/>
 			<button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
 			     halign="center" height="16" label="Add..." label_selected="Add..."
 			     left_delta="5" mouse_opaque="true" name="add_banned" scale_image="true"
diff --git a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
index af34156f5..845f579a4 100644
--- a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
@@ -8,7 +8,7 @@
     <layout_panel mouse_opaque="false" auto_resize="true" user_resize="false" name="active_speakers_panel" height="232">
       <scroll_list bottom="25" top="232" left="0" right="-1"
 		       draw_stripes="false" follows="all" can_resize="true" column_padding="0" draw_heading="true"
-		       multi_select="false" name="speakers_list" search_column="1" sort_column="2" menu_file="menu_avs_list.xml">
+		       multi_select="false" name="speakers_list" search_column="1" sort_column="2" menu_num="0">
         <column name="icon_speaking_status" sort="speaking_status" width="20" />
         <column dynamicwidth="true" label="Name" name="speaker_name" />
         <column label="" name="speaking_status" width="0" />
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory.xml b/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 434b849ac..6aca3e743 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -612,7 +612,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
 			     name="Search" width="95" />
       <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" menu_file="menu_avs_list.xml"
+			     draw_heading="true" menu_num="0"
                                
 			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="326">
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory2.xml b/indra/newview/skins/default/xui/en-us/floater_directory2.xml
index 04062fe07..7d8fa681c 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory2.xml
@@ -548,7 +548,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
 			     name="Search" width="95" />
       <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" menu_file="menu_avs_list.xml"
+			     draw_heading="true" menu_num="0"
                                
 			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="326">
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory3.xml b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
index 952dabbdd..7d4b70e4a 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
@@ -671,7 +671,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
 			     name="Search" width="95" />
       <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" menu_file="menu_avs_list.xml"
+			     draw_heading="true" menu_num="0"
                                
 			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="326">
diff --git a/indra/newview/skins/default/xui/en-us/panel_friends.xml b/indra/newview/skins/default/xui/en-us/panel_friends.xml
index d92749b0b..ed98b4eb6 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -2,7 +2,7 @@
 <panel border="true" name="friends">
 	<string name="Multiple">Multiple friends...</string>
 	<scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true" follows="left|top|bottom|right" left="10" multi_select="true"
-	    name="friend_list" right="-100" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40" menu_file="menu_avs_list.xml">
+	    name="friend_list" right="-100" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40" menu_num="0">
 		<column image="ff_online_status_button.tga" name="icon_online_status" tool_tip="Online status" width="20"/>
 		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>
 		<column image="ff_visible_online_button.tga" name="icon_visible_online" tool_tip="Friend can see when you're online" width="20"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml b/indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml
index 47fa2c17a..00a13db8f 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends_horiz.xml
@@ -2,7 +2,7 @@
 <panel border="true" name="friends">
 	<string name="Multiple">Multiple friends...</string>
 	<scroll_list bottom="70" can_resize="true" column_padding="0" draw_heading="true" follows="left|top|bottom|right" left="5" multi_select="true"
-	    name="friend_list" right="-5" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40" menu_file="menu_avs_list.xml">
+	    name="friend_list" right="-5" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40" menu_num="0">
 		<column image="ff_online_status_button.tga" name="icon_online_status" tool_tip="Online status" width="20"/>
 		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>
 		<column image="ff_visible_online_button.tga" name="icon_visible_online" tool_tip="Friend can see when you're online" width="20"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 6f42f18cc..7fa95e152 100644
--- a/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -76,7 +76,7 @@ Hover your mouse over the options for more help.
 	<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-88"
 	     column_padding="0" draw_border="true" draw_heading="true" multi_select="true"
 	     follows="left|top" heading_font="SansSerifSmall" heading_height="14"
-	     height="80" left="7" mouse_opaque="true" menu_file="menu_avs_list.xml"
+	     height="80" left="7" mouse_opaque="true" menu_num="0"
 	     name="visible_members" width="404">
 		<column label="Member Name" name="name" relwidth="0.45" />
 		<column label="Title" name="title" relwidth="0.30" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index 098122431..9e03915de 100644
--- a/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -72,7 +72,7 @@ execute the Ability.
 			     label="Search" left_delta="105" name="search_button" width="60" />
 			<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
 			     column_padding="0" draw_border="true" draw_heading="true"
-			     heading_font="SansSerifSmall" menu_file="menu_avs_list.xml"
+			     heading_font="SansSerifSmall" menu_num="0"
 			     heading_height="14" height="120" left="4" multi_select="true"
 			     name="member_list" width="396">
 				<column label="Member Name" name="name" width="136" />
@@ -222,7 +222,7 @@ things in this group. There&apos;s a broad variety of Abilities.
 		</text>
 		<name_list bottom_delta="-105" draw_border="true" draw_stripes="false" enabled="false"
 		     height="105" left="0" multi_select="true" name="role_assigned_members"
-		     width="145" menu_file="menu_avs_list.xml"/>
+		     width="145" menu_num="0"/>
 		<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
 		     initial_value="false" label="Members are visible" left="0"
 		     mouse_opaque="true" name="role_visible_in_list" radio_style="false"
@@ -263,6 +263,6 @@ things in this group. There&apos;s a broad variety of Abilities.
 		<name_list background_opaque="true" background_visible="true" bg_alpha_color="blue"
 		     bg_opaque_color="grey" bottom_delta="0" draw_border="true"
 		     height="125" left="150" multi_select="true" name="action_members"
-		     width="254" menu_file="menu_avs_list.xml"/>
+		     width="254" menu_num="0"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 36210856a..54ba74117 100644
--- a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -9,7 +9,7 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" min_height="100" name="moderate_chat_panel" top_delta="0" user_resize="false" visible="true" width="140">
-			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="113" menu_file="menu_avs_list.xml">
+			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="113" menu_num="0">
 				<column name="icon_speaking_status" sort="speaking_status" width="20"/>
 				<column dynamicwidth="true" label="Name" name="speaker_name"/>
 				<column label="" name="speaking_status" width="0"/>

From 236fa2a2842341d767e822425bf4a9acd07b8faa Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 24 Jan 2014 22:57:19 -0500
Subject: [PATCH 02/25] Fix Issue 870: Crouch toggle not reset when pressing
 "Fly" button, causes avatar to run/fly downhill.

Reimplements crouch toggle such that crouch is now tracked by the agent object
Fixes crouch being reset when restoring focus to the viewer window, as well.
---
 indra/newview/llagent.cpp          | 10 +++++++++-
 indra/newview/llagent.h            |  9 +++++++++
 indra/newview/llappviewer.cpp      |  2 +-
 indra/newview/llviewerkeyboard.cpp |  9 ++-------
 indra/newview/llviewerkeyboard.h   |  1 -
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 78c5c666e..cdacbeb94 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -420,6 +420,7 @@ LLAgent::LLAgent() :
 
 	mNextFidgetTime(0.f),
 	mCurrentFidget(0),
+	mCrouch(false),
 	mFirstLogin(FALSE),
 	mGenderChosen(FALSE),
 	mAppearanceSerialNum(0),
@@ -639,13 +640,14 @@ void LLAgent::moveUp(S32 direction)
 	if (direction > 0)
 	{
 		setControlFlags(AGENT_CONTROL_UP_POS | AGENT_CONTROL_FAST_UP);
+		mCrouch = false;
 	}
 	else if (direction < 0)
 	{
 		setControlFlags(AGENT_CONTROL_UP_NEG | AGENT_CONTROL_FAST_UP);
 	}
 
-	if (!isCrouch) camera_reset_on_motion();
+	if (!mCrouch) camera_reset_on_motion();
 }
 
 //-----------------------------------------------------------------------------
@@ -687,6 +689,11 @@ void LLAgent::movePitch(F32 mag)
 	}
 }
 
+bool LLAgent::isCrouching() const
+{
+	return mCrouch && !getFlying(); // Never crouch when flying
+}
+
 
 // Does this parcel allow you to fly?
 BOOL LLAgent::canFly()
@@ -770,6 +777,7 @@ void LLAgent::setFlying(BOOL fly)
 		{
 			LLViewerStats::getInstance()->incStat(LLViewerStats::ST_FLY_COUNT);
 		}
+		mCrouch = false;
 		setControlFlags(AGENT_CONTROL_FLY);
 	}
 	else
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 26501953a..a66b375f4 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -302,6 +302,15 @@ private:
 	F32				mNextFidgetTime;
 	S32				mCurrentFidget;
 
+	//--------------------------------------------------------------------
+	// Crouch
+	//--------------------------------------------------------------------
+public:
+	bool isCrouching() const;
+	void toggleCrouch() { mCrouch = !mCrouch; }
+private:
+	bool mCrouch;
+
 	//--------------------------------------------------------------------
 	// Fly
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 32501de62..eb1a28576 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1220,7 +1220,7 @@ bool LLAppViewer::mainLoop()
 				{
 					joystick->scanJoystick();
 					gKeyboard->scanKeyboard();
-					if(isCrouch)
+					if (gAgent.isCrouching())
 					{
 						gAgent.moveUp(-1);
 					}
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index 1c8b3b629..8c899a4ae 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -61,14 +61,11 @@ const F32 YAW_NUDGE_RATE = 0.05f;  // fraction of normal speed
 
 LLViewerKeyboard gViewerKeyboard;
 
-bool isCrouch = false; //Shouldn't start crouched.
-
 void agent_jump( EKeystate s )
 {
 	if( KEYSTATE_UP == s  ) return;
 	F32 time = gKeyboard->getCurKeyElapsedTime();
 	S32 frame_count = llround(gKeyboard->getCurKeyElapsedFrameCount());
-	isCrouch = false;
 	if( time < FLY_TIME 
 		|| frame_count <= FLY_FRAMES 
 		|| gAgent.upGrabbed()
@@ -86,18 +83,17 @@ void agent_toggle_down( EKeystate s )
 {
 	if(KEYSTATE_UP == s) return;
 	
-	gAgent.moveUp(-1);
 	if(KEYSTATE_DOWN == s && !gAgent.getFlying() && gSavedSettings.getBOOL("SGShiftCrouchToggle"))
 	{
-		isCrouch = !isCrouch;
+		gAgent.toggleCrouch();
 	}
+	gAgent.moveUp(-1);
 }
 
 void agent_push_down( EKeystate s )
 {
 	if( KEYSTATE_UP == s  ) return;
 	gAgent.moveUp(-1);
-	isCrouch = false;
 }
 
 static void agent_handle_doubletap_run(EKeystate s, LLAgent::EDoubleTapRunMode mode)
@@ -247,7 +243,6 @@ void agent_toggle_fly( EKeystate s )
 	if (KEYSTATE_DOWN == s )
 	{
 		gAgent.toggleFlying();
-		isCrouch = false;
 	}
 }
 
diff --git a/indra/newview/llviewerkeyboard.h b/indra/newview/llviewerkeyboard.h
index e3ef315b5..2be702fee 100644
--- a/indra/newview/llviewerkeyboard.h
+++ b/indra/newview/llviewerkeyboard.h
@@ -93,6 +93,5 @@ protected:
 };
 
 extern LLViewerKeyboard gViewerKeyboard;
-extern bool isCrouch;
 void agent_push_forward(EKeystate s);
 #endif // LL_LLVIEWERKEYBOARD_H

From 42bf70849cf29d65a972a60ee90d9cd9a39bb71e Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sat, 25 Jan 2014 09:44:42 -0500
Subject: [PATCH 03/25] Fix Issue 1344: Weird mesh distorted bug

Animations require consistent names for points like Avatar Center between viewers
To fix this, we now use Avatar Center instead of Root at the lower levels,
but this is okay, we translate Avatar Center into Root at UI level!
---
 indra/newview/character/avatar_lad.xml        |  2 +-
 indra/newview/llvoavatarself.cpp              | 22 +++++++++----------
 .../newview/skins/default/xui/de/strings.xml  |  2 +-
 .../skins/default/xui/en-us/strings.xml       |  2 +-
 .../newview/skins/default/xui/es/strings.xml  |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index d65f1e09b..f33d06be1 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -408,7 +408,7 @@
        id="40"
        group="6"
        pie_slice="4"
-       name="Root"
+       name="Avatar Center"
        joint="mRoot"
        position="0 0 0"
        rotation="0 0 0"
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index ab2833220..e01998284 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -388,11 +388,11 @@ void LLVOAvatarSelf::buildContextMenus()
 					LLMenuItemCallGL* item;
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
 					// We need the userdata param to disable options in this pie menu later on (Left Hand / Right Hand option)
-					item = new LLMenuItemCallGL(attachment->getName(), 
+					item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 												NULL, 
 												object_selected_and_point_valid, attachment);
 // [/RLVa:KB]
-//						item = new LLMenuItemCallGL(attachment->getName(), 
+//						item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 //													NULL, 
 //													object_selected_and_point_valid);
 					item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", iter->first);
@@ -425,7 +425,7 @@ void LLVOAvatarSelf::buildContextMenus()
 				LLViewerJointAttachment* attachment = iter->second;
 				if (attachment->getGroup() == i)
 				{
-					gDetachPieMenu->addChild(new LLMenuItemCallGL(attachment->getName(),
+					gDetachPieMenu->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 						&handle_detach_from_avatar, object_attached, attachment));
 
 					attachment_found = TRUE;
@@ -451,16 +451,16 @@ void LLVOAvatarSelf::buildContextMenus()
 			LLMenuItemCallGL* item;
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
 			// We need the userdata param to disable options in this pie menu later on
-			item = new LLMenuItemCallGL(attachment->getName(), 
+			item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 										NULL, 
 										object_selected_and_point_valid, attachment);
 // [/RLVa:KB]
-//				item = new LLMenuItemCallGL(attachment->getName(), 
+//				item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 //											NULL, 
 //											object_selected_and_point_valid);
 			item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", iter->first);
 			gAttachScreenPieMenu->addChild(item);
-			gDetachScreenPieMenu->addChild(new LLMenuItemCallGL(attachment->getName(), 
+			gDetachScreenPieMenu->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 						&handle_detach_from_avatar, object_attached, attachment));
 		}
 	}
@@ -482,13 +482,13 @@ void LLVOAvatarSelf::buildContextMenus()
 				continue;
 			}
 			// RELEASE-RLVa: random comment because we want know if LL ever changes this to not include "attachment" as userdata
-			LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
+			LLMenuItemCallGL* item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 														  NULL, &object_selected_and_point_valid,
 														  &attach_label, attachment);
 			item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", iter->first);
 			gAttachSubMenu->addChild(item);
 
-			gDetachSubMenu->addChild(new LLMenuItemCallGL(attachment->getName(), 
+			gDetachSubMenu->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 				&handle_detach_from_avatar, object_attached, &detach_label, attachment));
 			
 		}
@@ -546,14 +546,14 @@ void LLVOAvatarSelf::buildContextMenus()
 			{
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
 				// We need the userdata param to disable options in this pie menu later on
-				LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
+				LLMenuItemCallGL* item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 															  NULL, object_selected_and_point_valid, attachment);
 // [/RLVa:KB]
-//					LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
+//					LLMenuItemCallGL* item = new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 //																  NULL, object_selected_and_point_valid);
 				gAttachBodyPartPieMenus[group]->addChild(item);
 				item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", attach_index);
-				gDetachBodyPartPieMenus[group]->addChild(new LLMenuItemCallGL(attachment->getName(), 
+				gDetachBodyPartPieMenus[group]->addChild(new LLMenuItemCallGL(LLTrans::getString(attachment->getName()),
 																			&handle_detach_from_avatar,
 																			object_attached, attachment));
 				if (!context) cur_pie_slice++;
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index af47a3311..d866f90c4 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1955,7 +1955,7 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<string name="Left Pec">Linke Brust</string>
 	<string name="Right Pec">Rechts</string>
     <string name="Neck">Hals</string>
-    <string name="Root">Basis</string>
+    <string name="Avatar Center">Basis</string>
 	<string name="Invalid Attachment">Ungültige Stelle für Anhang</string>
 
   <!-- HUD Position -->
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 9d1da2465..7453a18f6 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3231,7 +3231,7 @@ The
 	<string name="Left Pec">Left Pec</string>
 	<string name="Right Pec">Right Pec</string>
   <string name="Neck">Neck</string>
-  <string name="Root">Root</string>
+  <string name="Avatar Center">Root</string>
   <string name="Invalid Attachment">Invalid Attachment Point</string>
 
   <!-- Account types, see LLAvatarPropertiesProcessor -->
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index c96fa3378..228ef4642 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -3746,7 +3746,7 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<string name="Left Pec">Pectoral Izquierdo</string>
 	<string name="Right Pec">Pectoral Derecho</string>
     <string name="Neck">Cuello</string>
-    <string name="Root">Base</string>
+    <string name="Avatar Center">Base</string>
     <string name="Invalid Attachment">Punto de anexión inválido</string>
 
   <!-- Account types, see LLAvatarPropertiesProcessor -->

From 6a3ee5fac44a082eb3f7b7f208419fda367eb00b Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 27 Jan 2014 13:54:13 -0500
Subject: [PATCH 04/25] [RLVa] f9f8dbe23ec3 ported

- internal : reviewed @startim for CHUI (SL-3.5)
    -> fixed : "Start Conference Chat" on a selection of multiple calling cards opens an IM session
    -> fixed : actions that would result in an IM window opening shouldn't be blocked if the session is already open
    -> added : RlvActions class to mimick LLAvatarActions and lowering the rlvhandler.h include dependency
---
 indra/newview/CMakeLists.txt                  |  2 +
 indra/newview/llavataractions.cpp             | 45 +++++++---------
 indra/newview/llfloateravatarpicker.cpp       |  5 +-
 indra/newview/llgroupactions.cpp              | 12 +++--
 indra/newview/llinventoryactions.cpp          | 23 +++++++++
 indra/newview/rlvactions.cpp                  | 51 +++++++++++++++++++
 indra/newview/rlvactions.h                    | 42 +++++++++++++++
 indra/newview/rlvhandler.h                    | 11 ----
 .../skins/default/xui/de/rlva_strings.xml     |  2 +-
 .../skins/default/xui/en-us/rlva_strings.xml  |  2 +-
 .../skins/default/xui/es/rlva_strings.xml     |  2 +-
 11 files changed, 150 insertions(+), 47 deletions(-)
 create mode 100644 indra/newview/rlvactions.cpp
 create mode 100644 indra/newview/rlvactions.h

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 41f172981..4772df0c4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -574,6 +574,7 @@ set(viewer_SOURCE_FILES
     noise.cpp
     pipeline.cpp
     qtoolalign.cpp
+    rlvactions.cpp
     rlvcommon.cpp
     rlvextensions.cpp
     rlvfloaterbehaviour.cpp
@@ -1100,6 +1101,7 @@ set(viewer_HEADER_FILES
     noise.h
     pipeline.h
     qtoolalign.h
+    rlvactions.h
     rlvcommon.h
     rlvdefines.h
     rlvextensions.h
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 42f2e73d8..d9c5e9153 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -52,8 +52,9 @@
 #include "llslurl.h"			// IDEVO
 #include "llavatarname.h"
 #include "llagentui.h"
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
-#include "rlvhandler.h"
+// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0)
+#include "rlvactions.h"
+#include "rlvcommon.h"
 // [/RLVa:KB]
 
 #include "llviewerwindow.h"
@@ -182,16 +183,12 @@ void LLAvatarActions::startIM(const LLUUID& id)
 	if (id.isNull() || gAgentID == id)
 		return;
 
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
-	if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canStartIM(id)) )
+// [RLVa:KB] - Checked: 2013-05-09 (RLVa-1.4.9)
+	if ( (!RlvActions::canStartIM(id)) && (!RlvActions::hasOpenP2PSession(id)) )
 	{
-		LLUUID idSession = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL, id);
-		if ( (idSession.notNull()) && (!gIMMgr->hasSession(idSession)) )
-		{
-			make_ui_sound("UISndInvalidOp");
-			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTIM, LLSD().with("RECIPIENT", LLSLURL("agent", id, "completename").getSLURLString()));
-			return;
-		}
+		make_ui_sound("UISndInvalidOp");
+		RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTIM, LLSD().with("RECIPIENT", LLSLURL("agent", id, "completename").getSLURLString()));
+		return;
 	}
 // [/RLVa:KB]
 
@@ -234,16 +231,12 @@ void LLAvatarActions::startCall(const LLUUID& id)
 		return;
 	}
 
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
-	if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canStartIM(id)) )
+// [RLVa:KB] - Checked: 2013-05-09 (RLVa-1.4.9)
+	if ( (!RlvActions::canStartIM(id)) && (!RlvActions::hasOpenP2PSession(id)) )
 	{
-		LLUUID idSession = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL, id);
-		if ( (idSession.notNull()) && (!gIMMgr->hasSession(idSession)) )
-		{
-			make_ui_sound("UISndInvalidOp");
-			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTIM, LLSD().with("RECIPIENT", LLSLURL("agent", id, "completename").getSLURLString()));
-			return;
-		}
+		make_ui_sound("UISndInvalidOp");
+		RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTIM, LLSD().with("RECIPIENT", LLSLURL("agent", id, "completename").getSLURLString()));
+		return;
 	}
 // [/RLVa:KB]
 
@@ -262,12 +255,12 @@ void LLAvatarActions::startAdhocCall(const uuid_vec_t& ids)
 	LLDynamicArray<LLUUID> id_array;
 	for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it)
 	{
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
+// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0)
 		const LLUUID& idAgent = *it;
-		if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canStartIM(idAgent)) )
+		if (!RlvActions::canStartIM(idAgent))
 		{
 			make_ui_sound("UISndInvalidOp");
-			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTCONF, LLSD().with("RECIPIENT", LLSLURL("agent", idAgent, "completename").getSLURLString()));
+			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTCONF);
 			return;
 		}
 		id_array.push_back(idAgent);
@@ -315,12 +308,12 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids)
 {
 	for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it)
 	{
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
+// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0)
 		const LLUUID& idAgent = *it;
-		if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canStartIM(idAgent)) )
+		if (!RlvActions::canStartIM(idAgent))
 		{
 			make_ui_sound("UISndInvalidOp");
-			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTCONF, LLSD().with("RECIPIENT", LLSLURL("agent", idAgent, "completename").getSLURLString()));
+			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTCONF);
 			return;
 		}
 // [/RLVa:KB]
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index dec0a2ef7..f503fa3ba 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -37,6 +37,7 @@
 #include "llviewerregion.h"		// getCapability()
 #include "llworld.h"
 // [RLVa:KB] - Checked: 2010-06-04 (RLVa-1.2.2a)
+#include "rlvactions.h"
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -549,8 +550,8 @@ BOOL LLFloaterAvatarPicker::handleDragAndDrop(S32 x, S32 y, MASK mask,
 				if (dest_agent_id.notNull() && dest_agent_id != gAgentID)
 				{
 //					if (drop)
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
-					if ( (drop) && ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.canStartIM(dest_agent_id)) ) )
+// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0)
+					if ( (drop) && (RlvActions::canStartIM(dest_agent_id)) )
 // [/RLVa:KB]
 					{
 						// Start up IM before give the item
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 60a4a6caf..da27ac259 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -41,8 +41,10 @@
 #include "llviewermessage.h"
 #include "groupchatlistener.h"
 #include "hippolimits.h" // for getMaxAgentGroups
-// [RLVa:KB] - Checked: 2011-03-28 (RLVa-1.3.0f)
+// [RLVa:KB] - Checked: 2011-03-28 (RLVa-1.3.0)
 #include "llslurl.h"
+#include "rlvactions.h"
+#include "rlvcommon.h"
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -142,8 +144,8 @@ void LLGroupActions::startCall(const LLUUID& group_id)
 		return;
 	}
 
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
-	if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canStartIM(group_id)) && (!gIMMgr->hasSession(group_id)) )
+// [RLVa:KB] - Checked: 2013-05-09 (RLVa-1.4.9)
+	if ( (!RlvActions::canStartIM(group_id)) && (!RlvActions::hasOpenGroupSession(group_id)) )
 	{
 		make_ui_sound("UISndInvalidOp");
 		RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTIM, LLSD().with("RECIPIENT", LLSLURL("group", group_id, "about").getSLURLString()));
@@ -398,8 +400,8 @@ LLUUID LLGroupActions::startIM(const LLUUID& group_id)
 {
 	if (group_id.isNull()) return LLUUID::null;
 
-// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
-	if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canStartIM(group_id)) && (!gIMMgr->hasSession(group_id)) )
+// [RLVa:KB] - Checked: 2013-05-09 (RLVa-1.4.9)
+	if ( (!RlvActions::canStartIM(group_id)) && (!RlvActions::hasOpenGroupSession(group_id)) )
 	{
 		make_ui_sound("UISndInvalidOp");
 		RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTIM, LLSD().with("RECIPIENT", LLSLURL("group", group_id, "about").getSLURLString()));
diff --git a/indra/newview/llinventoryactions.cpp b/indra/newview/llinventoryactions.cpp
index a02de1998..bb69789b5 100644
--- a/indra/newview/llinventoryactions.cpp
+++ b/indra/newview/llinventoryactions.cpp
@@ -49,6 +49,10 @@
 #include "lltrans.h"
 #include "llvoavatarself.h"
 #include "llnotifications.h"
+// [RLVa:KB] - Checked: 2013-05-08 (RLVa-1.4.9)
+#include "rlvactions.h"
+#include "rlvcommon.h"
+// [/RLVa:KB]
 
 extern LLUUID gAgentID;
 
@@ -455,6 +459,10 @@ class LLBeginIMSession : public inventory_panel_listener_t
 		LLDynamicArray<LLUUID> members;
 		EInstantMessage type = IM_SESSION_CONFERENCE_START;
 
+// [RLVa:KB] - Checked: 2013-05-08 (RLVa-1.4.9)
+		bool fRlvCanStartIM = true;
+// [/RLVa:KB]
+
 		for (std::set<LLUUID>::const_iterator iter = selected_items.begin(); iter != selected_items.end(); iter++)
 		{
 
@@ -493,6 +501,9 @@ class LLBeginIMSession : public inventory_panel_listener_t
 							id = item_array.get(i)->getCreatorUUID();
 							if(at.isBuddyOnline(id))
 							{
+// [RLVa:KB] - Checked: 2013-05-08 (RLVa-1.4.9)
+								fRlvCanStartIM &= RlvActions::canStartIM(id);
+// [RLVa:KB]
 								members.put(id);
 							}
 						}
@@ -515,6 +526,9 @@ class LLBeginIMSession : public inventory_panel_listener_t
 
 							if(at.isBuddyOnline(id))
 							{
+// [RLVa:KB] - Checked: 2013-05-08 (RLVa-1.4.9)
+								fRlvCanStartIM &= RlvActions::canStartIM(id);
+// [RLVa:KB]
 								members.put(id);
 							}
 						}
@@ -526,6 +540,15 @@ class LLBeginIMSession : public inventory_panel_listener_t
 		// the session_id is randomly generated UUID which will be replaced later
 		// with a server side generated number
 
+// [RLVa:KB] - Checked: 2013-05-08 (RLVa-1.4.9)
+		if (!fRlvCanStartIM)
+		{
+			make_ui_sound("UISndIvalidOp");
+			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_STARTCONF);
+			return true;
+		}
+// [/RLVa:KB]
+
 		if (name.empty())
 		{
 			name = llformat("Session %d", session_num++);
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
new file mode 100644
index 000000000..01c626f2f
--- /dev/null
+++ b/indra/newview/rlvactions.cpp
@@ -0,0 +1,51 @@
+/** 
+ *
+ * Copyright (c) 2009-2013, 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;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt 
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
+ * 
+ * By copying, modifying or distributing this software, you acknowledge that
+ * you have read and understood your obligations described above, and agree to 
+ * abide by those obligations.
+ * 
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llimview.h"
+#include "rlvactions.h"
+#include "rlvhandler.h"
+
+// ============================================================================
+// RlvActions member functions
+//
+
+// Checked: 2011-04-12 (RLVa-1.3.0)
+bool RlvActions::canStartIM(const LLUUID& idRecipient)
+{
+	// User can start an IM session with "recipient" (could be an agent or a group) if:
+	//   - not generally restricted from starting IM sessions (or the recipient is an exception)
+	//   - not specifically restricted from starting an IM session with the recipient
+	return 
+		(!rlv_handler_t::isEnabled()) ||
+		( ( (!gRlvHandler.hasBehaviour(RLV_BHVR_STARTIM)) || (gRlvHandler.isException(RLV_BHVR_STARTIM, idRecipient)) ) &&
+		  ( (!gRlvHandler.hasBehaviour(RLV_BHVR_STARTIMTO)) || (!gRlvHandler.isException(RLV_BHVR_STARTIMTO, idRecipient)) ) );
+}
+
+// Checked: 2013-05-09 (RLVa-1.4.9)
+bool RlvActions::hasOpenP2PSession(const LLUUID& idAgent)
+{
+	const LLUUID idSession = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, idAgent);
+	return (idSession.notNull()) && (LLIMMgr::instance().hasSession(idSession));
+}
+
+// Checked: 2013-05-09 (RLVa-1.4.9)
+bool RlvActions::hasOpenGroupSession(const LLUUID& idGroup)
+{
+	return (idGroup.notNull()) && (LLIMMgr::instance().hasSession(idGroup));
+}
+
+// ============================================================================
diff --git a/indra/newview/rlvactions.h b/indra/newview/rlvactions.h
new file mode 100644
index 000000000..a6b411d24
--- /dev/null
+++ b/indra/newview/rlvactions.h
@@ -0,0 +1,42 @@
+/** 
+ *
+ * Copyright (c) 2009-2013, 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;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt 
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
+ * 
+ * By copying, modifying or distributing this software, you acknowledge that
+ * you have read and understood your obligations described above, and agree to 
+ * abide by those obligations.
+ * 
+ */
+
+#ifndef RLV_ACTIONS_H
+#define RLV_ACTIONS_H
+
+// ============================================================================
+// RlvActions class declaration
+//
+
+class RlvActions
+{
+public:
+
+	/*
+	 * Returns true if the user is allowed to start a - P2P or group - conversation with the specified UUID.
+	 */
+	static bool canStartIM(const LLUUID& idRecipient);								// @startim and @startimto
+
+	/*
+	 * 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);
+};
+
+// ============================================================================
+
+#endif // RLV_ACTIONS_H
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index 79db80cee..8c0f010af 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -96,7 +96,6 @@ public:
  	bool canShowHoverText(const LLViewerObject* pObj) const;									// @showhovertext* command family
 	bool canSendIM(const LLUUID& idRecipient) const;											// @sendim and @sendimto
 	bool canSit(LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;
-	bool canStartIM(const LLUUID& idRecipient) const;											// @startim and @startimto
 	bool canStand() const;
 	bool canTeleportViaLure(const LLUUID& idAgent) const;
 	bool canTouch(const LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;	// @touch
@@ -277,16 +276,6 @@ inline bool RlvHandler::canShowHoverText(const LLViewerObject *pObj) const
 			   (isException(RLV_BHVR_SHOWHOVERTEXT, pObj->getID(), RLV_CHECK_PERMISSIVE)) ) );
 }
 
-inline bool RlvHandler::canStartIM(const LLUUID& idRecipient) const
-{
-	// User can start an IM session with "recipient" (could be an agent or a group) if:
-	//   - not generally restricted from starting IM sessions (or the recipient is an exception)
-	//   - not specifically restricted from starting an IM session with the recipient
-	return
-		( (!hasBehaviour(RLV_BHVR_STARTIM)) || (isException(RLV_BHVR_STARTIM, idRecipient)) ) &&
-		( (!hasBehaviour(RLV_BHVR_STARTIMTO)) || (!isException(RLV_BHVR_STARTIMTO, idRecipient)) );
-}
-
 // Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
 inline bool RlvHandler::canTeleportViaLure(const LLUUID& idAgent) const
 {
diff --git a/indra/newview/skins/default/xui/de/rlva_strings.xml b/indra/newview/skins/default/xui/de/rlva_strings.xml
index 187d6b8bd..9f062332b 100644
--- a/indra/newview/skins/default/xui/de/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/de/rlva_strings.xml
@@ -15,7 +15,7 @@
     <string name="blocked_generic">Aktion konnte aufgrund von RLV-Einschränkungen nicht durchgeführt werden.</string>
     <string name="blocked_permattach">Der Versuch „[OBJECT]“ anzuhängen wurde aufgrund von RLV-Einschränkungen verweigert.</string>
     <string name="blocked_startim">IM-Sitzung mit [RECIPIENT] konnte aufgrund von RLV-Einschränkungen nicht gestartet werden.</string>
-    <string name="blocked_startconf">Konferenz mit [RECIPIENT] konnte aufgrund von RLV-Einschränkungen nicht gestartet werden.</string>
+    <string name="blocked_startconf">Konferenz konnte aufgrund von RLV-Einschränkungen nicht gestartet werden.</string>
     <string name="blocked_teleport">Teleport konnte aufgrund von RLV-Einschränkungen nicht initialisiert werden.</string>
     <string name="blocked_viewxxx">[TYPE] konnte aufgrund von RLV-Einschränkungen nicht geöffnet werden.</string>
 
diff --git a/indra/newview/skins/default/xui/en-us/rlva_strings.xml b/indra/newview/skins/default/xui/en-us/rlva_strings.xml
index 8beadd514..73ddc6710 100644
--- a/indra/newview/skins/default/xui/en-us/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/en-us/rlva_strings.xml
@@ -15,7 +15,7 @@
     <string name="blocked_generic">Unable to perform action due to RLV restrictions</string>
     <string name="blocked_permattach">Attempt to attach '[OBJECT]' was denied due to RLV restrictions</string>
     <string name="blocked_startim">Unable to start IM session with [RECIPIENT] due to RLV restrictions</string>
-    <string name="blocked_startconf">Unable to start conference with [RECIPIENT] due to RLV restrictions</string>
+    <string name="blocked_startconf">Unable to start conference due to RLV restrictions</string>
     <string name="blocked_teleport">Unable to initiate teleport due to RLV restrictions</string>
     <string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
 
diff --git a/indra/newview/skins/default/xui/es/rlva_strings.xml b/indra/newview/skins/default/xui/es/rlva_strings.xml
index ec9141ebe..a1e1c3b61 100644
--- a/indra/newview/skins/default/xui/es/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/es/rlva_strings.xml
@@ -29,7 +29,7 @@
 			No se puede iniciar sesión de MI con [RECIPIENT] debido a las restricciones RLV
 		</string>
 		<string name="blocked_startconf">
-			No se puede iniciar una conferencia con [RECIPIENT] debido a las restricciones RLV
+			No se puede iniciar una conferencia debido a las restricciones RLV
 		</string>
 		<string name="blocked_teleport">
 			No se puede iniciar el Teleporte debido a las restricciones RLV

From 755d3be89b4499e55851b92834e20b094ce5c025 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 27 Jan 2014 20:14:02 -0500
Subject: [PATCH 05/25] [RLVa] Disallow inventory floaters when inventory
 restricted.

Formatting eases the diff with rlva upstream
---
 indra/newview/rlvui.cpp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index a434ad026..876149503 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -210,6 +210,34 @@ void RlvUIEnabler::onToggleShowInv(bool fQuitting)
 	{
 		LLInventoryView::closeAll();
 		LFFloaterInvPanel::closeAll();
+
+		// Singu Note: Hide our standalone inventory favorites floater if present
+		if (LLFloater* floater = LLUICtrlFactory::getInstance()->getBuiltFloater("floater_inventory_favs.xml"))
+			floater->close();
+	}
+
+	//
+	// Enable/disable the "My Outfits" panel on the "My Appearance" sidebar tab
+	//
+	LLFloater* pAppearancePanel = LLUICtrlFactory::getInstance()->getBuiltFloater("floater_my_outfits.xml");
+	if (pAppearancePanel)
+	{
+		// Singu Note: No RLV_ASSERTs. This is all a lie about our standalone My Outfits floater anyway.
+		if (!fEnable) pAppearancePanel->close();
+	}
+
+	//
+	// Filter (or stop filtering) opening new inventory floaters
+	//
+	if (!fEnable)
+	{
+		gMenuHolder->childSetEnabled("My Outfits", false);
+		gMenuHolder->childSetEnabled("Favorites", false);
+	}
+	else
+	{
+		gMenuHolder->childSetEnabled("My Outfits", true);
+		gMenuHolder->childSetEnabled("Favorites", true);
 	}
 }
 

From 94aee52c64b114360a3646c9acd89b88367254ad Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 27 Jan 2014 23:42:09 -0500
Subject: [PATCH 06/25] [RLVa] b15fdd026026 ported

- internal : reviewed @recvim and @sendim for CHUI (SL-3.5)

Singu changes:
- Updated busy to be referred to as do_not_disturb in llviewermessage.cpp
- Don't send autoresponse if we can't send an IM by rlva
- Updated checks for from name being system to be to_id and from_id null checks.
- Minor compile fix in rlvui.cpp for last commit.
---
 indra/newview/llimpanel.cpp       |  19 +++--
 indra/newview/llimview.cpp        |  22 +++---
 indra/newview/llviewermessage.cpp | 123 +++++++++++++++---------------
 indra/newview/llviewermessage.h   |   3 +-
 indra/newview/rlvactions.cpp      |  30 ++++++++
 indra/newview/rlvactions.h        |  20 ++++-
 indra/newview/rlvhandler.h        |  28 +------
 indra/newview/rlvui.cpp           |  51 ++++++++-----
 indra/newview/rlvui.h             |   1 +
 9 files changed, 170 insertions(+), 127 deletions(-)

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 82fde5f31..085d14a2f 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -62,8 +62,9 @@
 
 #include "boost/algorithm/string.hpp"
 
-// [RLVa:KB]
-#include "rlvhandler.h"
+// [RLVa:KB] - Checked: 2013-05-10 (RLVa-1.4.9)
+#include "rlvactions.h"
+#include "rlvcommon.h"
 // [/RLVa:KB]
 
 class AIHTTPTimeoutPolicy;
@@ -1142,6 +1143,7 @@ void deliver_message(const std::string& utf8_text,
 
 bool convert_roleplay_text(std::string& text); // Returns true if text is an action
 
+// Singu Note: LLFloaterIMSession::sendMsg
 void LLFloaterIMPanel::onSendMsg()
 {
 	if (!gAgent.isGodlike() 
@@ -1164,17 +1166,18 @@ void LLFloaterIMPanel::onSendMsg()
 			bool action = convert_roleplay_text(utf8_text);
 			if (!action && mRPMode)
 				utf8_text = "((" + utf8_text + "))";
-// [RLVa:KB] - Checked: 2011-09-17 (RLVa-1.1.4b) | Modified: RLVa-1.1.4b
-			if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) )
+
+// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
+			if ( (RlvActions::hasBehaviour(RLV_BHVR_SENDIM)) || (RlvActions::hasBehaviour(RLV_BHVR_SENDIMTO)) )
 			{
 				bool fRlvFilter = false;
 				switch (mSessionType)
 				{
 					case P2P_SESSION:	// One-on-one IM
-						fRlvFilter = !gRlvHandler.canSendIM(mOtherParticipantUUID);
+						fRlvFilter = !RlvActions::canSendIM(mOtherParticipantUUID);
 						break;
 					case GROUP_SESSION:	// Group chat
-						fRlvFilter = !gRlvHandler.canSendIM(mSessionUUID);
+						fRlvFilter = !RlvActions::canSendIM(mSessionUUID);
 						break;
 					case ADHOC_SESSION:	// Conference chat: allow if all participants can be sent an IM
 						{
@@ -1190,7 +1193,7 @@ void LLFloaterIMPanel::onSendMsg()
 									itSpeaker != speakers.end(); ++itSpeaker)
 							{
 								const LLSpeaker* pSpeaker = *itSpeaker;
-								if ( (gAgentID != pSpeaker->mID) && (!gRlvHandler.canSendIM(pSpeaker->mID)) )
+								if ( (gAgentID != pSpeaker->mID) && (!RlvActions::canSendIM(pSpeaker->mID)) )
 								{
 									fRlvFilter = true;
 									break;
@@ -1204,7 +1207,9 @@ void LLFloaterIMPanel::onSendMsg()
 				}
 
 				if (fRlvFilter)
+				{
 					utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
+				}
 			}
 // [/RLVa:KB]
 
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 48ae523b7..ec1d74946 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -55,8 +55,9 @@
 #include "llvoavatar.h" // For mIdleTimer reset
 #include "llviewerregion.h"
 
-// [RLVa:KB]
-#include "rlvhandler.h"
+// [RLVa:KB] - Checked: 2013-05-10 (RLVa-1.4.9)
+#include "rlvactions.h"
+#include "rlvcommon.h"
 // [/RLVa:KB]
 
 class AIHTTPTimeoutPolicy;
@@ -86,7 +87,7 @@ LLColor4 agent_chat_color(const LLUUID& id, const std::string& name, bool local_
 		return gSavedSettings.getColor4("AscentLindenColor");
 
 	// [RLVa:LF] Chat colors would identify names, don't use them in local chat if restricted
-	if (local_chat && rlv_handler_t::isEnabled() && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+	if (local_chat && RlvActions::hasBehaviour(RLV_BHVR_SHOWNAMES))
 		return gSavedSettings.getColor4("AgentChatColor");
 
 	static const LLCachedControl<bool> color_friend_chat("ColorFriendChat");
@@ -104,11 +105,6 @@ LLColor4 agent_chat_color(const LLUUID& id, const std::string& name, bool local_
 	return local_chat ? gSavedSettings.getColor4("AgentChatColor") : gSavedSettings.getColor("IMChatColor");
 }
 
-// returns true if a should appear before b
-//static BOOL group_dictionary_sort( LLGroupData* a, LLGroupData* b )
-//{
-//	return (LLStringUtil::compareDict( a->mName, b->mName ) < 0);
-//}
 
 class LLViewerChatterBoxInvitationAcceptResponder : public LLHTTPClient::ResponderWithResult
 {
@@ -1492,15 +1488,15 @@ public:
 			}
 
 			bool group = gAgent.isInGroup(session_id);
-// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c
-			if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) )
+// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
+			if ( (RlvActions::hasBehaviour(RLV_BHVR_RECVIM)) || (RlvActions::hasBehaviour(RLV_BHVR_RECVIMFROM)) )
 			{
-				if (group)												// Group chat: don't accept the invite if not an exception
+				if (group)
 				{
-					if (!gRlvHandler.canReceiveIM(session_id))
+					if (!RlvActions::canReceiveIM(session_id))
 						return;
 				}
-				else if (!gRlvHandler.canReceiveIM(from_id))			// Conference chat: don't block; censor if not an exception
+				else if (!RlvActions::canReceiveIM(from_id))
 				{
 					message = RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
 				}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a27bbedb4..0978d2b8b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -111,7 +111,7 @@
 #include "llviewerregion.h"
 
 // [RLVa:KB] - Checked: 2010-03-09 (RLVa-1.2.0a)
-#include "llfloateravatarinfo.h" // Checked: 2009-07-08 (RLVa-1.0.0e)
+#include "rlvactions.h"
 #include "rlvhandler.h"
 #include "rlvinventory.h"
 #include "rlvui.h"
@@ -1628,6 +1628,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		args["[NAME]"] = mFromName;
 		LLFloaterChat::addChatHistory(LLTrans::getString("InvOfferAcceptSilent", args));
 	}
+
 	break;
 	
 	case IOR_BUSY:
@@ -1688,7 +1689,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		}
 		if (busy &&	(!mFromGroup && !mFromObject))
 		{
-			busy_message(msg,mFromID);
+			send_do_not_disturb_message(msg,mFromID);
 		}
 		break;
 	}
@@ -2246,7 +2247,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		llinfos << "RegionID: " << region_id.asString() << llendl;
 	// </edit>
 
-	BOOL is_busy = gAgent.getBusy();
+	BOOL is_do_not_disturb = gAgent.getBusy();
 	BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat)
 		// object IMs contain sender object id in session_id (STORM-1209)
 		|| dialog == IM_FROM_TASK && LLMuteList::getInstance()->isMuted(session_id);
@@ -2315,7 +2316,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// do nothing -- don't distract newbies in
 			// Prelude with global IMs
 		}
-// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0)
 		else if ( (rlv_handler_t::isEnabled()) && (offline == IM_ONLINE) && ("@version" == message) &&
 		          (!is_muted) && ((!accept_im_from_only_friend) || (is_friend)) )
 		{
@@ -2325,19 +2326,28 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			gIMMgr->processIMTypingStop(im_info);
 		}
 // [/RLVa:KB]
-//		else if (offline == IM_ONLINE && !is_linden && !is_muted && is_busy && name != SYSTEM_FROM)
-// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c
-		else if ( (offline == IM_ONLINE && !is_linden && !is_muted && is_busy && name != SYSTEM_FROM) && (gRlvHandler.canReceiveIM(from_id)) )
+//		else if (offline == IM_ONLINE
+//					&& is_do_not_disturb
+//					&& !is_muted // Singu Note: Never if muted
+//					&& from_id.notNull() //not a system message
+//					&& to_id.notNull()) //not global message
+// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0) | Modified: RLVa-1.3.0c
+		else if (offline == IM_ONLINE
+					&& is_do_not_disturb
+					&& !is_muted // Singu Note: Never if muted
+					&& from_id.notNull() //not a system message
+					&& to_id.notNull() //not global message
+					&& RlvActions::canReceiveIM(from_id))
 // [/RLVa:KB]
 		{
-			// return a standard "busy" message, but only do it to online IM
+			// return a standard "do not disturb" message, but only do it to online IM
 			// (i.e. not other auto responses and not store-and-forward IM)
 			if (!gIMMgr->hasSession(session_id) || gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat"))
 			{
 				// if the user wants to repeat responses over and over or
 				// if there is not a panel for this conversation (i.e. it is a new IM conversation
 				// initiated by the other party) then...
-				if (to_id.notNull()) busy_message(msg, from_id);
+				send_do_not_disturb_message(msg, from_id, session_id);
 			}
 
 			// now store incoming IM in chat history
@@ -2361,9 +2371,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
 			LLFloaterChat::addChat(chat, true, true);
 		}
-//		else if (to_id.notNull() && offline == IM_ONLINE && !is_linden && (is_autorespond || is_autorespond_nonfriends || is_autorespond_muted) && name != SYSTEM_FROM)
-// [RLVa:LF] - Same as above: Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c
-		else if (to_id.notNull() && offline == IM_ONLINE && !is_linden && (is_autorespond || is_autorespond_nonfriends || is_autorespond_muted) && name != SYSTEM_FROM && gRlvHandler.canReceiveIM(from_id))
+//		else if (offline == IM_ONLINE && (is_autorespond || is_autorespond_nonfriends || is_autorespond_muted) && from_id.notNull() && to_id.notNull())
+// [RLVa:LF] - Same as above: Checked: 2010-11-30 (RLVa-1.3.0)
+		else if (offline == IM_ONLINE && (is_autorespond || is_autorespond_nonfriends || is_autorespond_muted) && from_id.notNull() && to_id.notNull() && RlvActions::canReceiveIM(from_id) && RlvActions::canSendIM(from_id))
 // [/RLVa:LF]
 		{
 			// now store incoming IM in chat history
@@ -2475,9 +2485,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				mute_im = true;
 			}
 
-// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0c) | Modified: RLVa-1.3.0c
+// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
 			// Don't block offline IMs, or IMs from Lindens
-			if ( (rlv_handler_t::isEnabled()) && (offline != IM_OFFLINE) && (!is_linden) && (!gRlvHandler.canReceiveIM(from_id)) )
+			if ( (rlv_handler_t::isEnabled()) && (offline != IM_OFFLINE) && (!RlvActions::canReceiveIM(from_id)) && (!is_linden) )
 			{
 				if (!mute_im)
 					RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM_REMOTE), session_id);
@@ -2562,7 +2572,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_TYPING_START:
 		{
 			// Don't announce that someone has started messaging, if they're muted or when in busy mode
-			if (!is_muted && (!accept_im_from_only_friend || is_friend) && !is_busy && !gIMMgr->hasSession(computed_session_id) && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
+			if (!is_muted && (!accept_im_from_only_friend || is_friend) && !is_do_not_disturb && !gIMMgr->hasSession(computed_session_id) && gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming"))
 			{
 				std::string pns_name;
 				if (!LLAvatarNameCache::getPNSName(from_id, pns_name)) pns_name = name;
@@ -2758,12 +2768,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		break;
 	case IM_GROUP_INVITATION:
 		{
-			//if (!is_linden && (is_busy || is_muted))
+			//if (is_do_not_disturb || is_muted)
 			if (is_muted) return;
-			if (is_busy)
+			if (is_do_not_disturb)
 			{
 				LLMessageSystem *msg = gMessageSystem;
-				busy_message(msg,from_id);
+				send_do_not_disturb_message(msg,from_id);
 			}
 			else
 			{
@@ -2850,7 +2860,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			info->mFromName = name;
 			info->mDesc = message;
 			info->mHost = msg->getSender();
-			//if (((is_busy && !is_owned_by_me) || is_muted))
+			//if (((is_do_not_disturb && !is_owned_by_me) || is_muted))
 			if (is_muted)
 			{
 				// Prefetch the offered item so that it can be discarded by the appropriate observer. (EXT-4331)
@@ -2862,7 +2872,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				info->forceResponse(IOR_DECLINE);
 			}
 			/* Singu Note: Handle this inside inventory_offer_handler so if the user wants to autoaccept offers, they can while busy.
-			else if (is_busy && dialog != IM_TASK_INVENTORY_OFFERED) // busy mode must not affect interaction with objects (STORM-565)
+			else if (is_do_not_disturb && dialog != IM_TASK_INVENTORY_OFFERED) // busy mode must not affect interaction with objects (STORM-565)
 			{
 				// Until throttling is implemented, busy mode should reject inventory instead of silently
 				// accepting it.  SEE SL-39554
@@ -2920,7 +2930,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	
 	case IM_SESSION_SEND:
 	{
-		if (!is_linden && is_busy)
+		if (!is_linden && is_do_not_disturb)
 		{
 			return;
 		}
@@ -2938,16 +2948,16 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			return;
 		}
 
-		if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) )
+		if (from_id != gAgentID && (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM) || gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)))
 		{
 			switch (pIMFloater->getSessionType())
 			{
 				case LLFloaterIMPanel::GROUP_SESSION:	// Group chat
-					if ( (from_id != gAgent.getID()) && (!gRlvHandler.canReceiveIM(session_id)) )
+					if (!RlvActions::canReceiveIM(session_id))
 						return;
 					break;
 				case LLFloaterIMPanel::ADHOC_SESSION:	// Conference chat
-					if ( (from_id != gAgent.getID()) && (!gRlvHandler.canReceiveIM(from_id)) )
+					if (!RlvActions::canReceiveIM(from_id))
 						message = RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
 					break;
 				default:
@@ -2996,7 +3006,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 	case IM_FROM_TASK:
 		{
-			if (is_busy && !is_owned_by_me)
+			if (is_do_not_disturb && !is_owned_by_me)
 			{
 				return;
 			}
@@ -3075,8 +3085,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			LLFloaterChat::addChat(chat, FALSE, FALSE);
 		}
 		break;
+
 	case IM_FROM_TASK_AS_ALERT:
-		if (is_busy && !is_owned_by_me)
+		if (is_do_not_disturb && !is_owned_by_me)
 		{
 			return;
 		}
@@ -3090,14 +3101,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_BUSY_AUTO_RESPONSE:
 		if (is_muted)
 		{
-			LL_DEBUGS("Messaging") << "Ignoring busy response from " << from_id << LL_ENDL;
+			LL_DEBUGS("Messaging") << "Ignoring do-not-disturb response from " << from_id << LL_ENDL;
 			return;
 		}
 		else
 		{
-			// TODO: after LLTrans hits release, get "busy response" into translatable file
-			buffer = llformat("%s (%s): %s", name.c_str(), "busy response", message.substr(message_offset).c_str());
-			gIMMgr->addMessage(session_id, from_id, name, buffer);
+			gIMMgr->addMessage(session_id, from_id, name, message);
 		}
 		break;
 		
@@ -3116,12 +3125,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			{ 
 				return;
 			}
-//			else if (is_busy) 
+//			else if (is_do_not_disturb)
 // [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
-			else if ( (is_busy)  && (!fRlvSummon) )
+			else if ( (is_do_not_disturb)  && (!fRlvSummon) )
 // [/RLVa:KB]
 			{
-				busy_message(msg,from_id);
+				send_do_not_disturb_message(msg, from_id);
 			}
 			else
 			{
@@ -3184,13 +3193,13 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					if (IM_TELEPORT_REQUEST != dialog && !gRlvHandler.canTeleportViaLure(from_id))
 					{
 						RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_TPLURE_REMOTE));
-						if (is_busy)
-							busy_message(msg,from_id);
+						if (is_do_not_disturb)
+							send_do_not_disturb_message(msg, from_id);
 						return;
 					}
 
 					// Censor lure message if: 1) restricted from receiving IMs from the sender, or 2) @showloc=n restricted
-					if ( (!gRlvHandler.canReceiveIM(from_id)) || (IM_TELEPORT_REQUEST != dialog && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+					if ( (!RlvActions::canReceiveIM(from_id)) || (IM_TELEPORT_REQUEST != dialog && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
 					{
 						message = RlvStrings::getString(RLV_STRING_HIDDEN);
 					}
@@ -3215,8 +3224,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				if ( IM_TELEPORT_REQUEST != dialog && (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTTP)) || (fRlvSummon)) )
 				{
 					gRlvHandler.setCanCancelTp(false);
-					if (is_busy)
-						busy_message(msg,from_id);
+					if (is_do_not_disturb)
+						send_do_not_disturb_message(msg, from_id);
 					LLNotifications::instance().forceResponse(LLNotification::Params("TeleportOffered").payload(payload), 0);
 				}
 				else
@@ -3355,17 +3364,16 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			payload["online"] = (offline == IM_ONLINE);
 			payload["sender"] = msg->getSender().getIPandPort();
 
-			if (!is_muted && is_busy)
-			{
-				busy_message(msg, from_id);
-				LLNotifications::instance().forceResponse(LLNotification::Params("OfferFriendship").payload(payload), 1);
-			}
-			else if (is_muted)
+			if (is_muted)
 			{
 				LLNotifications::instance().forceResponse(LLNotification::Params("OfferFriendship").payload(payload), 1);
 			}
 			else
 			{
+				if (is_do_not_disturb)
+				{
+					send_do_not_disturb_message(msg, from_id);
+				}
 				args["[NAME]"] = name;
 				if(message.empty())
 				{
@@ -3395,12 +3403,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			args["NAME"] = name;
 			LLSD payload;
 			payload["from_id"] = from_id;
-			LLAvatarNameCache::get(from_id, boost::bind(&notification_display_name_callback,
-														 _1,
-														 _2,
-														 "FriendshipAccepted",
-														 args,
-														 payload));
+			LLAvatarNameCache::get(from_id, boost::bind(&notification_display_name_callback, _1, _2, "FriendshipAccepted", args, payload));
 		}
 		break;
 
@@ -3418,7 +3421,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	}
 }
 
-void busy_message (LLMessageSystem* msg, LLUUID from_id) 
+void send_do_not_disturb_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id)
 {
 	if (gAgent.getBusy())
 	{
@@ -3429,7 +3432,7 @@ void busy_message (LLMessageSystem* msg, LLUUID from_id)
 		from_name = LLCacheName::cleanFullName(from_name);
 		std::string response = gSavedPerAccountSettings.getString("BusyModeResponse");
 		pack_instant_message(
-			gMessageSystem,
+			msg,
 			gAgent.getID(),
 			FALSE,
 			gAgent.getSessionID(),
@@ -3487,7 +3490,7 @@ bool callingcard_offer_callback(const LLSD& notification, const LLSD& response)
 		msg->nextBlockFast(_PREHASH_TransactionBlock);
 		msg->addUUIDFast(_PREHASH_TransactionID, notification["payload"]["transaction_id"].asUUID());
 		msg->sendReliable(LLHost(notification["payload"]["sender"].asString()));
-		busy_message(msg, notification["payload"]["source_id"].asUUID());
+		send_do_not_disturb_message(msg, notification["payload"]["source_id"].asUUID());
 		break;
 	default:
 		// close button probably, possibly timed out
@@ -3748,7 +3751,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		chat.mFromName = from_name;
 	}
 
-	BOOL is_busy = gAgent.getBusy();
+	BOOL is_do_not_disturb = gAgent.getBusy();
 
 	BOOL is_muted = FALSE;
 	BOOL is_linden = FALSE;
@@ -3866,7 +3869,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 		// record last audible utterance
 		if (is_audible
-			&& (is_linden || (!is_muted && !is_busy)))
+			&& (is_linden || (!is_muted && !is_do_not_disturb)))
 		{
 			if (chat.mChatType != CHAT_TYPE_START 
 				&& chat.mChatType != CHAT_TYPE_STOP)
@@ -4057,7 +4060,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			LLLocalSpeakerMgr::getInstance()->setSpeakerTyping(from_id, FALSE);
 			static_cast<LLVOAvatar*>(chatter)->stopTyping();
 
-			if (!is_muted /*&& !is_busy*/)
+			if (!is_muted /*&& !is_do_not_disturb*/)
 			{
 				static const LLCachedControl<bool> use_chat_bubbles("UseChatBubbles",false);
 				visible_in_chat_bubble = use_chat_bubbles;
@@ -4200,7 +4203,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		}
 
 		chat.mMuted = is_muted && !is_linden;
-		bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_busy);
+		bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_do_not_disturb);
 #if 0	// Google translate doesn't work anymore
 		if (!chat.mMuted)
 		{
@@ -7590,14 +7593,14 @@ void send_lures(const LLSD& notification, const LLSD& response)
 	LLAgentUI::buildSLURL(slurl);
 	text.append("\r\n").append(slurl.getSLURLString());
 
-// [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)) )
+// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
+	if ( (RlvActions::hasBehaviour(RLV_BHVR_SENDIM)) || (RlvActions::hasBehaviour(RLV_BHVR_SENDIMTO)) )
 	{
 		// Filter the lure message if one of the recipients of the lure can't be sent an IM to
 		for (LLSD::array_const_iterator it = notification["payload"]["ids"].beginArray();
 				it != notification["payload"]["ids"].endArray(); ++it)
 		{
-			if (!gRlvHandler.canSendIM(it->asUUID()))
+			if (!RlvActions::canSendIM(it->asUUID()))
 			{
 				text = RlvStrings::getString(RLV_STRING_HIDDEN);
 				break;
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
index a31b7f486..ea3275cd7 100644
--- a/indra/newview/llviewermessage.h
+++ b/indra/newview/llviewermessage.h
@@ -70,7 +70,6 @@ enum InventoryOfferResponse
 BOOL can_afford_transaction(S32 cost);
 void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group = FALSE,
 				S32 trx_type = TRANS_GIFT, const std::string& desc = LLStringUtil::null);
-void busy_message (LLMessageSystem* msg, LLUUID from_id);
 
 void process_logout_reply(LLMessageSystem* msg, void**);
 void process_layer_data(LLMessageSystem *mesgsys, void **user_data);
@@ -160,6 +159,8 @@ void send_group_notice(const LLUUID& group_id,
 					   const std::string& message,
 					   const LLInventoryItem* item);
 
+void send_do_not_disturb_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id = LLUUID::null);
+
 void handle_lure(const LLUUID& invitee);
 void handle_lure(const uuid_vec_t& ids);
 
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 01c626f2f..454fee692 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -23,6 +23,30 @@
 // RlvActions member functions
 //
 
+// Checked: 2010-11-30 (RLVa-1.3.0)
+bool RlvActions::canReceiveIM(const LLUUID& idSender)
+{
+	// User can receive an IM from "sender" (could be an agent or a group) if:
+	//   - not generally restricted from receiving IMs (or the sender is an exception)
+	//   - not specifically restricted from receiving an IM from the sender
+	return
+		(!rlv_handler_t::isEnabled()) ||
+		( ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, idSender)) ) &&
+		  ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIMFROM)) || (!gRlvHandler.isException(RLV_BHVR_RECVIMFROM, idSender)) ) );
+}
+
+// Checked: 2010-11-30 (RLVa-1.3.0)
+bool RlvActions::canSendIM(const LLUUID& idRecipient)
+{
+	// User can send an IM to "recipient" (could be an agent or a group) if:
+	//   - not generally restricted from sending IMs (or the recipient is an exception)
+	//   - not specifically restricted from sending an IM to the recipient
+	return
+		(!rlv_handler_t::isEnabled()) ||
+		( ( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.isException(RLV_BHVR_SENDIM, idRecipient)) ) &&
+		  ( (!gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) || (!gRlvHandler.isException(RLV_BHVR_SENDIMTO, idRecipient)) ) );
+}
+
 // Checked: 2011-04-12 (RLVa-1.3.0)
 bool RlvActions::canStartIM(const LLUUID& idRecipient)
 {
@@ -35,6 +59,12 @@ bool RlvActions::canStartIM(const LLUUID& idRecipient)
 		  ( (!gRlvHandler.hasBehaviour(RLV_BHVR_STARTIMTO)) || (!gRlvHandler.isException(RLV_BHVR_STARTIMTO, idRecipient)) ) );
 }
 
+// Checked: 2013-05-10 (RLVa-1.4.9)
+bool RlvActions::hasBehaviour(ERlvBehaviour eBhvr)
+{
+	return gRlvHandler.hasBehaviour(eBhvr);
+}
+
 // Checked: 2013-05-09 (RLVa-1.4.9)
 bool RlvActions::hasOpenP2PSession(const LLUUID& idAgent)
 {
diff --git a/indra/newview/rlvactions.h b/indra/newview/rlvactions.h
index a6b411d24..b586e2dbc 100644
--- a/indra/newview/rlvactions.h
+++ b/indra/newview/rlvactions.h
@@ -17,19 +17,37 @@
 #ifndef RLV_ACTIONS_H
 #define RLV_ACTIONS_H
 
+#include "rlvdefines.h"
+
 // ============================================================================
-// RlvActions class declaration
+// RlvActions class declaration - developer-friendly non-RLVa code facing class, use in lieu of RlvHandler whenever possible
 //
 
 class RlvActions
 {
 public:
 
+	/*
+	 * Returns true if the user is allowed to receive IMs from the specified sender (can be an avatar or a group)
+	 */
+	static bool canReceiveIM(const LLUUID& idSender);
+
+	/*
+	 * Returns true if the user is allowed to send IMs to the specified recipient (can be an avatar or a group)
+	 */
+	static bool canSendIM(const LLUUID& idRecipient);
+
 	/*
 	 * Returns true if the user is allowed to start a - P2P or group - conversation with the specified UUID.
 	 */
 	static bool canStartIM(const LLUUID& idRecipient);								// @startim and @startimto
 
+	/*
+	 * Convenience function to check for a behaviour without having to include rlvhandler.h. 
+	 * Do NOT call this function if speed is important (i.e. per-frame)
+	 */
+	static bool hasBehaviour(ERlvBehaviour eBhvr);
+
 	/*
 	 * Returns true if a - P2P or group - IM session is open with the specified UUID.
 	 */
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index 8c0f010af..7c8289c66 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -92,9 +92,7 @@ public:
 
 	// Command specific helper functions
 	bool canEdit(const LLViewerObject* pObj) const;												// @edit and @editobj
-	bool canReceiveIM(const LLUUID& idSender) const;											// @recvim and @recvimfrom
- 	bool canShowHoverText(const LLViewerObject* pObj) const;									// @showhovertext* command family
-	bool canSendIM(const LLUUID& idRecipient) const;											// @sendim and @sendimto
+	bool canShowHoverText(const LLViewerObject* pObj) const;									// @showhovertext* command family
 	bool canSit(LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;
 	bool canStand() const;
 	bool canTeleportViaLure(const LLUUID& idAgent) const;
@@ -244,29 +242,7 @@ inline bool RlvHandler::canEdit(const LLViewerObject* pObj) const
 		((!hasBehaviour(RLV_BHVR_EDITOBJ)) || (!isException(RLV_BHVR_EDITOBJ, pObj->getRootEdit()->getID())));
 }
 
-// Checked: 2010-11-30 (RLVa-1.3.0c) | Added: RLVa-1.3.0c
-inline bool RlvHandler::canReceiveIM(const LLUUID& idSender) const
-{
-	// User can receive an IM from "sender" (could be an agent or a group) if:
-	//   - not generally restricted from receiving IMs (or the sender is an exception)
-	//   - not specifically restricted from receiving an IM from the sender
-	return 
-		( (!hasBehaviour(RLV_BHVR_RECVIM)) || (isException(RLV_BHVR_RECVIM, idSender)) ) &&
-		( (!hasBehaviour(RLV_BHVR_RECVIMFROM)) || (!isException(RLV_BHVR_RECVIMFROM, idSender)) );
-}
-
-// Checked: 2010-11-30 (RLVa-1.3.0c) | Added: RLVa-1.3.0c
-inline bool RlvHandler::canSendIM(const LLUUID& idRecipient) const
-{
-	// User can send an IM to "recipient" (could be an agent or a group) if:
-	//   - not generally restricted from sending IMs (or the recipient is an exception)
-	//   - not specifically restricted from sending an IM to the recipient
-	return 
-		( (!hasBehaviour(RLV_BHVR_SENDIM)) || (isException(RLV_BHVR_SENDIM, idRecipient)) ) &&
-		( (!hasBehaviour(RLV_BHVR_SENDIMTO)) || (!isException(RLV_BHVR_SENDIMTO, idRecipient)) );
-}
-
-// Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.0.0f
+// Checked: 2010-03-27 (RLVa-1.4.0a) | Modified: RLVa-1.0.0f
 inline bool RlvHandler::canShowHoverText(const LLViewerObject *pObj) const
 {
 	return ( (!pObj) || (LL_PCODE_VOLUME != pObj->getPCode()) ||
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index 876149503..da06f3110 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -47,6 +47,8 @@
 #include "llfloaterchat.h"
 #include "llfloateravatarlist.h"
 #include "llfloaterworldmap.h"
+#include "llmenugl.h"
+#include "lluictrlfactory.h"
 #include "llviewerregion.h"
 
 #include "rlvui.h"
@@ -80,6 +82,7 @@ RlvUIEnabler::RlvUIEnabler()
 
 	// onToggleXXX
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_EDIT, boost::bind(&RlvUIEnabler::onToggleEdit, this)));
+	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_SENDIM, boost::bind(&RlvUIEnabler::onToggleSendIM, this)));
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_SETDEBUG, boost::bind(&RlvUIEnabler::onToggleSetDebug, this)));
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_SETENV, boost::bind(&RlvUIEnabler::onToggleSetEnv, this)));
 	m_Handlers.insert(std::pair<ERlvBehaviour, behaviour_handler_t>(RLV_BHVR_SHOWINV, boost::bind(&RlvUIEnabler::onToggleShowInv, this, _1)));
@@ -130,7 +133,7 @@ void RlvUIEnabler::onToggleEdit()
 		// Turn off "View / Highlight Transparent"
 		LLDrawPoolAlpha::sShowDebugAlpha = FALSE;
 
-		// Close the Beacons floater if it's open
+		// Hide the Beacons floater if it's currently visible
 		if (LLFloaterBeacons::instanceVisible())
 			LLFloaterBeacons::toggleInstance();
 
@@ -156,6 +159,15 @@ void RlvUIEnabler::onToggleMovement()
 		gAgent.clearTempRun();
 }
 
+// Checked: 2013-05-11 (RLVa-1.4.9)
+void RlvUIEnabler::onToggleSendIM()
+{
+	/* Singu Note: Don't hide settings just because they won't be used, that's just wrong.
+	bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM);
+	gSavedPerAccountSettings.getControl("BusyModeResponse")->setHiddenFromSettingsEditor(!fEnable);
+	*/
+}
+
 // Checked: 2011-05-28 (RLVa-1.4.0a) | Added: RLVa-1.4.0a
 void RlvUIEnabler::onToggleSetDebug()
 {
@@ -231,13 +243,13 @@ void RlvUIEnabler::onToggleShowInv(bool fQuitting)
 	//
 	if (!fEnable)
 	{
-		gMenuHolder->childSetEnabled("My Outfits", false);
-		gMenuHolder->childSetEnabled("Favorites", false);
+		LLMenuGL::sMenuContainer->childSetEnabled("My Outfits", false);
+		LLMenuGL::sMenuContainer->childSetEnabled("Favorites", false);
 	}
 	else
 	{
-		gMenuHolder->childSetEnabled("My Outfits", true);
-		gMenuHolder->childSetEnabled("Favorites", true);
+		LLMenuGL::sMenuContainer->childSetEnabled("My Outfits", true);
+		LLMenuGL::sMenuContainer->childSetEnabled("Favorites", true);
 	}
 }
 
@@ -251,13 +263,14 @@ void RlvUIEnabler::onToggleShowLoc()
 
 	if (!fEnable)
 	{
-				// Close the "About Land" floater if it's currently visible
+		// Hide the "About Land" floater if it's currently visible
 		if (LLFloaterLand::instanceVisible())
-						LLFloaterLand::hideInstance();
+			LLFloaterLand::hideInstance();
 
-		// Close the "Estate Tools" floater is it's currently visible
+		// Hide the "Region / Estate" floater if it's currently visible
 		if (LLFloaterRegionInfo::instanceVisible())
-				LLFloaterRegionInfo::hideInstance();
+			LLFloaterRegionInfo::hideInstance();
+		// Hide the "God Tools" floater if it's currently visible
 		LLFloaterGodTools::hide();
 	}
 }
@@ -265,7 +278,6 @@ void RlvUIEnabler::onToggleShowLoc()
 // Checked: 2010-02-28 (RLVa-1.4.0a) | Added: RLVa-1.2.0a
 void RlvUIEnabler::onToggleShowMinimap()
 {
-
 	bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP);
 
 	// Start or stop filtering showing the mini-map floater
@@ -281,12 +293,10 @@ void RlvUIEnabler::onToggleShowNames(bool fQuitting)
 
 	bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES);
 
-	// Close the "Active Speakers" panel if it's currently visible
-
-						
 	// Force the use of the "display name" cache so we can filter both display and legacy names (or return back to the user's preference)
 	if (!fEnable)
 	{
+		// Close the "Active Speakers" panel if it's currently visible
 		LLFloaterChat::getInstance()->childSetVisible("active_speakers_panel", false);
 		// Close the "Avatar List/Radar" floater if it's currently visible
 		if ( LLFloaterAvatarList::instanceExists() && LLFloaterAvatarList::getInstance()->getVisible() )
@@ -314,7 +324,8 @@ void RlvUIEnabler::onToggleShowWorldMap()
 // Checked: 2010-08-22 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
 void RlvUIEnabler::onToggleTp()
 {
-/*	// Disable the navigation bar "Home" button if both @tplm=n *and* @tploc=n restricted
+/* Singu TODO: LLNavigationBar
+	// Disable the navigation bar "Home" button if both @tplm=n *and* @tploc=n restricted
 	LLButton* pNavBarHomeBtn = LLNavigationBar::getInstance()->findChild<LLButton>("home_btn");
 	RLV_ASSERT(pNavBarHomeBtn);
 	if (pNavBarHomeBtn)
@@ -325,7 +336,7 @@ void RlvUIEnabler::onToggleTp()
 // Checked: 2010-03-01 (RLVa-1.2.0c) | Added: RLVa-1.2.0a
 void RlvUIEnabler::onToggleUnsit()
 {
-/*
+/* Singu TODO?
 	bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
 
 	LLPanelStandStopFlying* pPanelStand = LLPanelStandStopFlying::getInstance();
@@ -343,15 +354,17 @@ void RlvUIEnabler::onToggleUnsit()
 // Checked: 2010-03-01 (RLVa-1.2.0b) | Added: RLVa-1.2.0a
 void RlvUIEnabler::onToggleViewXXX()
 {
+/* Singu TODO?
 	// If any of the three are still active then we keep filtering
-	/*bool fHasViewXXX = (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) ||
+	bool fHasViewXXX = (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) ||
 		(gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE));
 
 	// Start or stop filtering opening the preview floaters
 	if ( (fHasViewXXX) && (!m_ConnFloaterViewXXX.connected()) )
 		m_ConnFloaterViewXXX = LLFloaterReg::setValidateCallback(boost::bind(&RlvUIEnabler::filterFloaterViewXXX, this, _1, _2));
 	else if ( (!fHasViewXXX) && (m_ConnFloaterViewXXX.connected()) )
-		m_ConnFloaterViewXXX.disconnect();*/
+		m_ConnFloaterViewXXX.disconnect();
+*/
 }
 
 // Checked: 2010-04-01 (RLVa-1.2.0c) | Added: RLVa-1.2.0c
@@ -370,7 +383,6 @@ void RlvUIEnabler::onUpdateLoginLastLocation(bool fQuitting)
 
 	if (!m_ConnFloaterGeneric.connected())
 		m_ConnFloaterGeneric = LLFloaterReg::setValidateCallback(boost::bind(&RlvUIEnabler::filterFloaterGeneric, this, _1, _2));
-
 }
 
 // Checked: 2010-02-28 (RLVa-1.4.0a) | Added: RLVa-1.2.0a
@@ -436,7 +448,8 @@ bool RlvUIEnabler::filterFloaterViewXXX(const std::string& strName, const LLSD&)
 		return false;
 	}
 	return true;
-}*/
+}
+*/
 
 // ============================================================================
 
diff --git a/indra/newview/rlvui.h b/indra/newview/rlvui.h
index 11eb75e28..067f13b1f 100644
--- a/indra/newview/rlvui.h
+++ b/indra/newview/rlvui.h
@@ -45,6 +45,7 @@ protected:
 	void onRefreshHoverText();											// showloc, shownames, showhovertext(all|world|hud)
 	void onToggleEdit();												// edit
 	void onToggleMovement();											// fly, alwaysrun and temprun
+	void onToggleSendIM();												// sendim
 	void onToggleSetDebug();											// setdebug
 	void onToggleSetEnv();												// setenv
 	void onToggleShowInv(bool fQuitting);								// showinv

From 14a885f8d02a85b7fbbfa646ebfa560dd856c8aa Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 27 Jan 2014 23:43:16 -0500
Subject: [PATCH 07/25] [RLVa] Modernizations

License updates, comment updates, settings cleanup, macros cleanup, dead code removal, etc.
---
 indra/newview/app_settings/settings_rlv.xml | 11 ---
 indra/newview/llappearancemgr.cpp           | 48 ++++++-----
 indra/newview/llviewermenu.cpp              | 47 ++++------
 indra/newview/rlvcommon.cpp                 | 96 +++------------------
 indra/newview/rlvcommon.h                   |  4 +-
 indra/newview/rlvdefines.h                  | 27 ++----
 indra/newview/rlvextensions.cpp             |  9 +-
 indra/newview/rlvextensions.h               |  8 +-
 indra/newview/rlvhandler.cpp                | 25 +++---
 indra/newview/rlvhandler.h                  |  9 +-
 indra/newview/rlvhelper.cpp                 | 41 ++++++++-
 indra/newview/rlvhelper.h                   |  8 +-
 indra/newview/rlvinventory.cpp              |  6 +-
 indra/newview/rlvinventory.h                |  6 +-
 indra/newview/rlvlocks.cpp                  | 24 +++---
 indra/newview/rlvlocks.h                    | 23 +++--
 16 files changed, 167 insertions(+), 225 deletions(-)

diff --git a/indra/newview/app_settings/settings_rlv.xml b/indra/newview/app_settings/settings_rlv.xml
index 7dd83af41..ca850aaca 100644
--- a/indra/newview/app_settings/settings_rlv.xml
+++ b/indra/newview/app_settings/settings_rlv.xml
@@ -222,17 +222,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>WarnFirstRLVGiveToRLV</key>
-    <map>
-      <key>Comment</key>
-      <string>Enables FirstRLVGiveToRLV warning dialog</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>ForceInitialCOFDelay</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 9416febb2..9b71c31d8 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -583,7 +583,7 @@ public:
 	void onWearableAssetFetch(LLViewerWearable *wearable);
 	void onAllComplete();
 
-// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-2.0)
 	bool pollStopped();
 // [/SL:KB]
 
@@ -670,7 +670,7 @@ void LLWearableHoldingPattern::eraseTypeToRecover(LLWearableType::EType type)
 	mTypesToRecover.erase(type);
 }
 
-// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-06-19 (Catznip-3.0.0a) | Added: Catznip-2.1.2a
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-06-19 (Catznip-2.1)
 //void LLWearableHoldingPattern::setObjItems(const LLInventoryModel::item_array_t& items)
 //{
 //	mObjItems = items;
@@ -780,10 +780,11 @@ void LLWearableHoldingPattern::onAllComplete()
 	LL_INFOS("Avatar") << self_av_string() << "Updating agent wearables with " << mResolved << " wearable items " << LL_ENDL;
 	LLAppearanceMgr::instance().updateAgentWearables(this, false);
 	
-// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-3.0.0a) | Added: Catznip-2.1.2a
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-03-22 (Catznip-2.1)
 //	// Update attachments to match those requested.
 //	if (isAgentAvatarValid())
 //	{
+//		LL_DEBUGS("Avatar") << self_av_string() << "Updating " << mObjItems.count() << " attachments" << LL_ENDL;
 //		llinfos << "Updating " << mObjItems.count() << " attachments" << llendl;
 //		LLAgentWearables::userUpdateAttachments(mObjItems);
 //	}
@@ -821,7 +822,7 @@ bool LLWearableHoldingPattern::pollFetchCompletion()
 		// runway skip here?
 		llwarns << self_av_string() << "skipping because LLWearableHolding pattern is invalid (superceded by later outfit request)" << llendl;
 
-// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-2.0)
 		// If we were signalled to stop then we shouldn't do anything else except poll for when it's safe to delete ourselves
 		doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollStopped, this));
 		return true;
@@ -897,7 +898,7 @@ void recovered_item_cb(const LLUUID& item_id, LLWearableType::EType type, LLView
 		// runway skip here?
 		llwarns << self_av_string() << "skipping because LLWearableHolding pattern is invalid (superceded by later outfit request)" << llendl;
 
-// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-2.0)
 		// If we were signalled to stop then we shouldn't do anything else except poll for when it's safe to delete ourselves
 		return;
 // [/SL:KB]
@@ -971,7 +972,7 @@ void LLWearableHoldingPattern::clearCOFLinksForMissingWearables()
 	}
 }
 
-// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-2.0)
 bool LLWearableHoldingPattern::pollStopped()
 {
 	// We have to keep on polling until we're sure that all callbacks have completed or they'll cause a crash
@@ -991,7 +992,7 @@ bool LLWearableHoldingPattern::pollMissingWearables()
 		// runway skip here?
 		llwarns << self_av_string() << "skipping because LLWearableHolding pattern is invalid (superceded by later outfit request)" << llendl;
 
-// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-3.0.0a) | Added: Catznip-2.0.0a
+// [SL:KB] - Patch: Appearance-COFCorruption | Checked: 2010-04-14 (Catznip-2.0)
 		// If we were signalled to stop then we shouldn't do anything else except poll for when it's safe to delete ourselves
 		doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollStopped, this));
 		return true;
@@ -1386,7 +1387,7 @@ bool LLAppearanceMgr::wearItemOnAvatar(const LLUUID& item_id_to_wear, bool do_up
 
 	if (gInventory.isObjectDescendentOf(item_to_wear->getUUID(), gInventory.getLibraryRootFolderID()))
 	{
-		LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(&wear_on_avatar_cb,_1,replace));
+		LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(wear_on_avatar_cb,_1,replace));
 		copy_inventory_item(gAgent.getID(), item_to_wear->getPermissions().getOwner(), item_to_wear->getUUID(), LLUUID::null, std::string(), cb);
 		return false;
 	} 
@@ -1744,7 +1745,7 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id)
 
 	// Check whether it's the base outfit.
 //	if (outfit_cat_id.isNull() || outfit_cat_id == getBaseOutfitUUID())
-// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-09-21 (Catznip-3.0.0a) | Added: Catznip-2.1.2d
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-09-21 (Catznip-2.1)
 	if ( (outfit_cat_id.isNull()) || ((outfit_cat_id == getBaseOutfitUUID()) && (!isOutfitDirty())) )
 // [/SL:KB]
 	{
@@ -1798,8 +1799,19 @@ void LLAppearanceMgr::purgeCategory(const LLUUID& category, bool keep_outfit_lin
 			continue;
 		if (item->getIsLinkType())
 		{
+#if 0
+			if (keep_items && keep_items->find(item) != LLInventoryModel::item_array_t::FAIL)
+			{
+				llinfos << "preserved item" << llendl;
+			}
+			else
+			{
+				gInventory.purgeObject(item->getUUID());
+			}
+#else
 			gInventory.purgeObject(item->getUUID());
 		}
+#endif
 	}
 }
 
@@ -1892,9 +1904,8 @@ void LLAppearanceMgr::filterWearableItems(
 		if (size <= 0)
 			continue;
 //		S32 start_index = llmax(0,size-max_per_type);
-// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-05-11 (Catznip-3.0.0a) | Added: Catznip-2.0.0h
-		S32 start_index = 
-			llmax(0, size - ((LLAssetType::AT_BODYPART == LLWearableType::getAssetType((LLWearableType::EType)i)) ? 1 : max_per_type));
+// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-05-11 (Catznip-2.0)
+		S32 start_index = llmax(0, size - ((LLAssetType::AT_BODYPART == LLWearableType::getAssetType((LLWearableType::EType)i)) ? 1 : max_per_type));
 // [/SL:KB[
 		for (S32 j = start_index; j<size; j++)
 		{
@@ -1948,7 +1959,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
 // [/RLVa:KB]
 {
 //	LLViewerInventoryCategory *pcat = gInventory.getCategory(category);
-//	llinfos << "starting, cat " << (pcat ? pcat->getName() : "[UNKNOWN]") << llendl;
+//	LL_INFOS("Avatar") << self_av_string() << "starting, cat '" << (pcat ? pcat->getName() : "[UNKNOWN]") << "'" << LL_ENDL;
 // [RLVa:KB] - Checked: 2010-03-26 (RLVa-1.2.0b) | Added: RLVa-1.2.0b
 	// RELEASE-RLVa: [SL-2.0.0] If pcat ever gets used for anything further down the beta we'll know about it
 	llinfos << "starting" << llendl;
@@ -2220,8 +2231,6 @@ void LLAppearanceMgr::updateAgentWearables(LLWearableHoldingPattern* holder, boo
 	{
 		gAgentWearables.setWearableOutfit(items, wearables, !append);
 	}
-
-//	dec_busy_count();
 }
 
 static void remove_non_link_items(LLInventoryModel::item_array_t &items)
@@ -2334,7 +2343,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering)
 	BoolSetter setIsInUpdateAppearanceFromCOF(mIsInUpdateAppearanceFromCOF);
 	selfStartPhase("update_appearance_from_cof");
 
-	LL_INFOS("Avatar") << self_av_string() << "starting" << LL_ENDL;
+	LL_DEBUGS("Avatar") << self_av_string() << "starting" << LL_ENDL;
 
 	//checking integrity of the COF in terms of ordering of wearables, 
 	//checking and updating links' descriptions of wearables in the COF (before analyzed for "dirty" state)
@@ -2372,7 +2381,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering)
 	remove_non_link_items(wear_items);
 	remove_non_link_items(obj_items);
 	remove_non_link_items(gest_items);
-// [SL:KB] - Patch: Apperance-Misc | Checked: 2010-11-24 (Catznip-3.0.0a) | Added: Catzip-2.4.0f
+// [SL:KB] - Patch: Apperance-Misc | Checked: 2010-11-24 (Catznip-2.4)
 	// Since we're following folder links we might have picked up new duplicates, or exceeded MAX_CLOTHING_PER_TYPE
 	removeDuplicateItems(wear_items);
 	removeDuplicateItems(obj_items);
@@ -2387,7 +2396,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering)
 	dumpItemArray(wear_items,"asset_dump: wear_item");
 	dumpItemArray(obj_items,"asset_dump: obj_item");
 
-// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
+// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-2.2)
 	// Update attachments to match those requested.
 	if (isAgentAvatarValid())
 	{
@@ -2704,7 +2713,6 @@ void LLAppearanceMgr::wearInventoryCategoryOnAvatar( LLInventoryCategory* catego
 void LLAppearanceMgr::wearOutfitByName(const std::string& name)
 {
 	LL_INFOS("Avatar") << self_av_string() << "Wearing category " << name << LL_ENDL;
-	//inc_busy_count();
 
 	LLInventoryModel::cat_array_t cat_array;
 	LLInventoryModel::item_array_t item_array;
@@ -3487,7 +3495,7 @@ public:
 	// Error
 	/*virtual*/ void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
 	{
-		llwarns << "appearance update request failed, status: " << status << " reason: " << reason << llendl;
+		llwarns << "appearance update request failed, status: " << status << " reason: " << reason << " code: " << content["code"].asInteger() << " error: \"" << content["error"].asString() << "\"" << llendl;
 		LL_DEBUGS("Avatar") << "content: " << ll_pretty_print_sd(content) << LL_ENDL;
 		onFailure(status);
 	}	
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 32e426544..b70001718 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -965,15 +965,13 @@ void init_client_menu(LLMenuGL* menu)
 	menu->addChild(sub_menu);
 
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1b | OK
-	#ifdef RLV_ADVANCED_MENU
-		sub_menu = new LLMenuGL("RLVa Embedded");
-		init_debug_rlva_menu(sub_menu);
-		menu->addChild(sub_menu);
-		// Top Level Menu as well
-		sub_menu = new LLMenuGL("RLVa Main");
-		init_debug_rlva_menu(sub_menu);
-		gMenuBarView->addChild(sub_menu);
-	#endif // RLV_ADVANCED_MENU
+	sub_menu = new LLMenuGL("RLVa Embedded");
+	init_debug_rlva_menu(sub_menu);
+	menu->addChild(sub_menu);
+	// Top Level Menu as well
+	sub_menu = new LLMenuGL("RLVa Main");
+	init_debug_rlva_menu(sub_menu);
+	gMenuBarView->addChild(sub_menu);
 // [/RLVa:KB]
 
 	sub_menu = new LLMenuGL("UI");
@@ -1100,10 +1098,8 @@ void init_client_menu(LLMenuGL* menu)
 										(void*)"ShowConsoleWindow"));
 
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-1.0.0e | OK
-	#ifdef RLV_ADVANCED_TOGGLE_RLVA
-		if (gSavedSettings.controlExists(RLV_SETTING_MAIN))
-			menu->addChild(new LLMenuItemCheckGL("RestrainedLove API", &rlvMenuToggleEnabled, NULL, &rlvMenuCheckEnabled, NULL));
-	#endif // RLV_ADVANCED_TOGGLE_RLVA
+	if (gSavedSettings.controlExists(RLV_SETTING_MAIN))
+		menu->addChild(new LLMenuItemCheckGL("RestrainedLove API", &rlvMenuToggleEnabled, NULL, &rlvMenuCheckEnabled, NULL));
 // [/RLVa:KB]
 
 	if(gSavedSettings.getBOOL("QAMode"))
@@ -1639,16 +1635,14 @@ void init_debug_rlva_menu(LLMenuGL* menu)
 		menu->addChild(new LLMenuItemCheckGL("Enable Shared Wear", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_ENABLESHAREDWEAR));
 	menu->addSeparator();
 
-	#ifdef RLV_EXTENSION_HIDELOCKED
-		if ( (gSavedSettings.controlExists(RLV_SETTING_HIDELOCKEDLAYER)) && 
-			 (gSavedSettings.controlExists(RLV_SETTING_HIDELOCKEDATTACH)) )
-		{
-			menu->addChild(new LLMenuItemCheckGL("Hide Locked Layers", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_HIDELOCKEDLAYER));
-			menu->addChild(new LLMenuItemCheckGL("Hide Locked Attachments", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_HIDELOCKEDATTACH));
-			//sub_menu->addChild(new LLMenuItemToggleGL("Hide locked inventory", &rlv_handler_t::fHideLockedInventory));
-			menu->addSeparator();
-		}
-	#endif // RLV_EXTENSION_HIDELOCKED
+	if ( (gSavedSettings.controlExists(RLV_SETTING_HIDELOCKEDLAYER)) &&
+			(gSavedSettings.controlExists(RLV_SETTING_HIDELOCKEDATTACH)) )
+	{
+		menu->addChild(new LLMenuItemCheckGL("Hide Locked Layers", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_HIDELOCKEDLAYER));
+		menu->addChild(new LLMenuItemCheckGL("Hide Locked Attachments", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_HIDELOCKEDATTACH));
+		//sub_menu->addChild(new LLMenuItemToggleGL("Hide locked inventory", &rlv_handler_t::fHideLockedInventory));
+		menu->addSeparator();
+	}
 
 	if (gSavedSettings.controlExists(RLV_SETTING_FORBIDGIVETORLV))
 		menu->addChild(new LLMenuItemCheckGL("Forbid Give to #RLV", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_FORBIDGIVETORLV));
@@ -1656,11 +1650,8 @@ void init_debug_rlva_menu(LLMenuGL* menu)
 		menu->addChild(new LLMenuItemCheckGL("Show Name Tags", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_SHOWNAMETAGS));
 	menu->addSeparator();
 
-	#ifdef RLV_EXTENSION_FLOATER_RESTRICTIONS
-		// TODO-RLVa: figure out a way to tell if floater_rlv_behaviour.xml exists
-		menu->addChild(new LLMenuItemCheckGL("Restrictions...", &RlvFloaterBehaviours::toggle, NULL, &RlvFloaterBehaviours::visible, NULL));
-		menu->addChild(new LLMenuItemCheckGL("Locks...", &RlvFloaterLocks::toggle, NULL, &RlvFloaterLocks::visible, NULL));
-	#endif // RLV_EXTENSION_FLOATER_RESTRICTIONS
+	menu->addChild(new LLMenuItemCheckGL("Restrictions...", &RlvFloaterBehaviours::toggle, NULL, &RlvFloaterBehaviours::visible, NULL));
+	menu->addChild(new LLMenuItemCheckGL("Locks...", &RlvFloaterLocks::toggle, NULL, &RlvFloaterLocks::visible, NULL));
 }
 // [/RLVa:KB]
 
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index e24c5f3d8..c274daa7e 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -18,6 +18,7 @@
 #include "llagent.h"
 #include "llagentui.h"
 #include "llavatarnamecache.h"
+#include "llinstantmessage.h"
 #include "llnotificationsutil.h"
 #include "lluictrlfactory.h"
 #include "sgversion.h"
@@ -37,44 +38,16 @@
 #include "../lscript/lscript_byteformat.h" //Need LSCRIPTRunTimePermissionBits and SCRIPT_PERMISSION_*
 #include <boost/algorithm/string.hpp>
 
-using namespace LLOldEvents;
-
 // ============================================================================
 // RlvNotifications
 //
 
-#ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
-// Checked: 2009-12-05 (RLVa-1.1.0h) | Added: RLVa-1.1.0h
-/*void RlvNotifications::notifyBehaviour(ERlvBehaviour eBhvr, ERlvParamType eType)
-{
-	const std::string& strMsg = RlvStrings::getBehaviourNotificationString(eBhvr, eType);
-	if (!strMsg.empty())
-	{
-		LLSD argsNotify;
-		argsNotify["MESSAGE"] = strMsg;
-		LLNotificationsUtil::add("SystemMessageTip", argsNotify);
-	}
-}*/
-#endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
-
-// Checked: 2009-11-11 (RLVa-1.1.0a) | Added: RLVa-1.1.0a/
-/*void RlvNotifications::notifyBlockedViewXXX(const char* pstrAssetType)
-{
-	LLStringUtil::format_map_t argsMsg; std::string strMsg = RlvStrings::getString(RLV_STRING_BLOCKED_VIEWXXX);
-	argsMsg["[TYPE]"] = pstrAssetType;
-	LLStringUtil::format(strMsg, argsMsg);
-
-	LLSD argsNotify;
-	argsNotify["MESSAGE"] = strMsg;
-	LLNotificationsUtil::add("SystemMessageTip", argsNotify);
-}
-*/
 // Checked: 2009-11-13 (RLVa-1.1.0b) | Modified: RLVa-1.1.0b
 /*
 void RlvNotifications::warnGiveToRLV()
 {
 	if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) )
-		LLNotifications::instance().add(RLV_SETTING_FIRSTUSE_GIVETORLV, LLSD(), LLSD(), &RlvUtil::onGiveToRLVConfirmation);
+		LLNotifications::instance().add(RLV_SETTING_FIRSTUSE_GIVETORLV, LLSD(), LLSD(), &RlvNotifications::onGiveToRLVConfirmation);
 }
 */
 
@@ -188,10 +161,6 @@ bool RlvSettings::onChangedSettingBOOL(const LLSD& sdValue, bool* pfSetting)
 
 std::vector<std::string> RlvStrings::m_Anonyms;
 std::map<std::string, std::string> RlvStrings::m_StringMap;
-#ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
-/*std::map<ERlvBehaviour, std::string> RlvStrings::m_BhvrAddMap;
-std::map<ERlvBehaviour, std::string> RlvStrings::m_BhvrRemMap;*/
-#endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
 
 // Checked: 2010-03-09 (RLVa-1.2.0a) | Added: RLVa-1.1.0h
 void RlvStrings::initClass()
@@ -227,25 +196,6 @@ void RlvStrings::initClass()
 					m_Anonyms.push_back(pAnonymNode->getTextContents());
 				}
 			}
-			#ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
-			/*else if (pNode->hasName("behaviour-notifications"))
-			{
-				std::string strBhvr, strType; ERlvBehaviour eBhvr;
-				for (LLXMLNode* pNotifyNode = pNode->getFirstChild(); pNotifyNode != NULL; pNotifyNode = pNotifyNode->getNextSibling())
-				{
-					if ( (!pNotifyNode->hasName("notification")) || (!pNotifyNode->getAttributeString("type", strType)) ||
-						 (!pNotifyNode->getAttributeString("behaviour", strBhvr)) || 
-						 ((eBhvr = RlvCommand::getBehaviourFromString(strBhvr)) == RLV_BHVR_UNKNOWN) )
-					{
-						continue;
-					}
-					if ("add" == strType)
-						m_BhvrAddMap.insert(std::pair<ERlvBehaviour, std::string>(eBhvr, pNotifyNode->getTextContents()));
-					else if ("rem" == strType)
-						m_BhvrRemMap.insert(std::pair<ERlvBehaviour, std::string>(eBhvr, pNotifyNode->getTextContents()));
-				}
-			}*/
-			#endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
 		}
 
 		if ( (m_StringMap.empty()) || (m_Anonyms.empty()) )
@@ -270,29 +220,11 @@ const std::string& RlvStrings::getAnonym(const std::string& strName)
 	return m_Anonyms[nHash % m_Anonyms.size()];
 }
 
-#ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
-// Checked: 2009-12-05 (RLVa-1.1.0h) | Added: RLVa-1.1.0h
-/*const std::string& RlvStrings::getBehaviourNotificationString(ERlvBehaviour eBhvr, ERlvParamType eType)
-{
-	if (RLV_TYPE_ADD == eType)
-	{
-		std::map<ERlvBehaviour, std::string>::const_iterator itString = m_BhvrAddMap.find(eBhvr);
-		return (itString != m_BhvrAddMap.end()) ? itString->second : LLStringUtil::null;
-	}
-	else if (RLV_TYPE_REMOVE == eType)
-	{
-		std::map<ERlvBehaviour, std::string>::const_iterator itString = m_BhvrRemMap.find(eBhvr);
-		return (itString != m_BhvrRemMap.end()) ? itString->second : LLStringUtil::null;
-	}
-	return LLStringUtil::null;
-}*/
-#endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
-
 // Checked: 2009-11-11 (RLVa-1.1.0a) | Added: RLVa-1.1.0a
 const std::string& RlvStrings::getString(const std::string& strStringName)
 {
 	static const std::string strMissing = "(Missing RLVa string)";
-	string_map_t::const_iterator itString = m_StringMap.find(strStringName);
+	std::map<std::string, std::string>::const_iterator itString = m_StringMap.find(strStringName);
 	return (itString != m_StringMap.end()) ? itString->second : strMissing;
 }
 
@@ -396,27 +328,21 @@ void RlvUtil::filterNames(std::string& strUTF8Text, bool fFilterLegacy)
 		LLAvatarName avName;
 		if (LLAvatarNameCache::get(idAgents[idxAgent], &avName))
 		{
-			const std::string& strAnonym = RlvStrings::getAnonym(avName.mDisplayName);
-
-			// NOTE: if the legacy first and last name are empty we get a legacy name of " " which would replace all spaces in the string
-			std::string strLegacyName;
-			if ( (fFilterLegacy) && (!avName.mLegacyFirstName.empty()) &&
-				 ((!avName.mIsDisplayNameDefault) || (LLCacheName::getDefaultLastName() == avName.mLegacyLastName)) )
-			{
-				strLegacyName = avName.getLegacyName();
-			}
+			const std::string& strDisplayName = avName.mDisplayName;
+			const std::string& strLegacyName = avName.getLegacyName();
+			const std::string& strAnonym = RlvStrings::getAnonym(avName);
 
 			// If the display name is a subset of the legacy name we need to filter that first, otherwise it's the other way around
-			if (boost::icontains(strLegacyName, avName.mDisplayName))
+			if (boost::icontains(strLegacyName, strDisplayName))
 			{
-				if (!strLegacyName.empty())
+				if (fFilterLegacy)
 					boost::ireplace_all(strUTF8Text, strLegacyName, strAnonym);
-				boost::ireplace_all(strUTF8Text, avName.mDisplayName, strAnonym);
+				boost::ireplace_all(strUTF8Text, strDisplayName, strAnonym);
 			}
 			else
 			{
-				boost::ireplace_all(strUTF8Text, avName.mDisplayName, strAnonym);
-				if (!strLegacyName.empty())
+				boost::ireplace_all(strUTF8Text, strDisplayName, strAnonym);
+				if (fFilterLegacy)
 					boost::ireplace_all(strUTF8Text, strLegacyName, strAnonym);
 			}
 		}
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index a767ed445..a0d5b1c8d 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -46,6 +46,7 @@ class LLInventoryItem;
 class LLViewerInventoryCategory;
 class LLViewerInventoryItem;
 class LLViewerJointAttachment;
+class LLViewerWearable;
 class LLWearable;
 
 //
@@ -141,8 +142,7 @@ public:
 
 protected:
 	static std::vector<std::string> m_Anonyms;
-	typedef std::map<std::string, std::string> string_map_t;
-	static string_map_t m_StringMap;
+	static std::map<std::string, std::string> m_StringMap;
 };
 
 // ============================================================================
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 9e000ddbd..58bf384c8 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -21,20 +21,10 @@
 // Extensions
 //
 
-// Comment out if you don't want the Advanced / RLVa menu (may prevent enabling some extensions or experimental features - see below)
-#define RLV_ADVANCED_MENU
-// Comment out if you provide your own way to enable/disable RLVa
-#define RLV_ADVANCED_TOGGLE_RLVA
-
-// Provides access to "advanced" features through the RLVa debug menu
-#define RLV_EXTENSION_FLOATER_RESTRICTIONS	// Enables the Advanced / RLVa / Restrictions... floater
-#define RLV_EXTENSION_HIDELOCKED			// "Hide locked layers", "Hide locked attachments" and "Hide locked inventory"
-
 // Extensions
 #define RLV_EXTENSION_CMD_GETSETDEBUG_EX	// Extends the debug variables accessible through @getdebug_xxx/@setdebug_xxx
 #define RLV_EXTENSION_CMD_FINDFOLDERS		// @findfolders:<option>=<channel> - @findfolder with multiple results
 #define RLV_EXTENSION_FORCEWEAR_GESTURES	// @attach*/detach* commands also (de)activate gestures
-#define RLV_EXTENSION_NOTIFY_BEHAVIOUR		// Provides the option to show a customizable notification whenever a behaviour gets (un)set
 #define RLV_EXTENSION_STARTLOCATION			// Reenables "Start Location" at login if not @tploc=n or @unsit=n restricted at last logoff
 #define RLV_EXPERIMENTAL					// Enables/disables experimental features en masse
 #define RLV_EXPERIMENTAL_CMDS				// Enables/disables experimental commands en masse
@@ -49,7 +39,6 @@
 	// Under development (don't include in public release)
 	#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 //		#define RLV_EXPERIMENTAL_COMPOSITEFOLDERS
-//		#define RLV_EXPERIMENTAL_FIRSTUSE				// Enables a number of "first use" popups
 	#endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #endif // RLV_EXPERIMENTAL
 
@@ -112,7 +101,7 @@ const S32 RLVa_VERSION_BUILD = 0;
 #define RLV_ROOT_FOLDER					"#RLV"
 #define RLV_CMD_PREFIX					'@'
 #define RLV_PUTINV_PREFIX				"#RLV/~"
-#define RLV_SETROT_OFFSET				F_PI_BY_TWO		// @setrot is off by 90° with the rest of SL
+#define RLV_SETROT_OFFSET				F_PI_BY_TWO		// @setrot is off by 90° with the rest of SL
 
 #define RLV_FOLDER_FLAG_NOSTRIP			"nostrip"
 #define RLV_FOLDER_PREFIX_HIDDEN		'.'
@@ -199,17 +188,17 @@ enum ERlvBehaviour {
 	RLV_BHVR_ATTACHOVER,			// "attachover"
 	RLV_BHVR_ATTACHTHIS,			// "attachthis"
 	RLV_BHVR_ATTACHTHISOVER,		// "attachthisover"
-	RLV_BHVR_ATTACHTHISEXCEPT,		// "attachthisexcept"
+	RLV_BHVR_ATTACHTHISEXCEPT,		// "attachthis_except"
 	RLV_BHVR_DETACHTHIS,			// "detachthis"
-	RLV_BHVR_DETACHTHISEXCEPT,		// "detachthisexcept"
+	RLV_BHVR_DETACHTHISEXCEPT,		// "detachthis_except"
 	RLV_BHVR_ATTACHALL,				// "attachall"
 	RLV_BHVR_ATTACHALLOVER,			// "attachallover"
 	RLV_BHVR_DETACHALL,				// "detachall"
 	RLV_BHVR_ATTACHALLTHIS,			// "attachallthis"
-	RLV_BHVR_ATTACHALLTHISEXCEPT,	// "attachallthisexcept"
+	RLV_BHVR_ATTACHALLTHISEXCEPT,	// "attachallthis_except"
 	RLV_BHVR_ATTACHALLTHISOVER,		// "attachallthisover"
 	RLV_BHVR_DETACHALLTHIS,			// "detachallthis"
-	RLV_BHVR_DETACHALLTHISEXCEPT,	// "detachallthisexcept"
+	RLV_BHVR_DETACHALLTHISEXCEPT,	// "detachallthis_except"
 	RLV_BHVR_ADJUSTHEIGHT,			// "adjustheight"
 	RLV_BHVR_TPTO,					// "tpto"
 	RLV_BHVR_VERSION,				// "version"
diff --git a/indra/newview/rlvextensions.cpp b/indra/newview/rlvextensions.cpp
index aa07dfcd2..fccd0fb5e 100644
--- a/indra/newview/rlvextensions.cpp
+++ b/indra/newview/rlvextensions.cpp
@@ -1,12 +1,12 @@
 /** 
  *
- * Copyright (c) 2009-2010, Kitty Barnett
+ * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -181,7 +181,6 @@ RlvWindLight::RlvWindLight()
 	m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("distancemultiplier", RlvWindLightControl(&pWLParamMgr->mDistanceMult)));
 	m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("maxaltitude",	RlvWindLightControl(&pWLParamMgr->mMaxAlt)));
 	m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("scenegamma",		RlvWindLightControl(&pWLParamMgr->mWLGamma)));
-	// TYPE_COLOR_R
 	m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("hazedensity",	RlvWindLightControl(&pWLParamMgr->mHazeDensity)));
 	m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("hazehorizon",	RlvWindLightControl(&pWLParamMgr->mHazeHorizon)));
 	// TYPE_COLOR
diff --git a/indra/newview/rlvextensions.h b/indra/newview/rlvextensions.h
index abc61b75d..33f8bde0f 100644
--- a/indra/newview/rlvextensions.h
+++ b/indra/newview/rlvextensions.h
@@ -1,12 +1,12 @@
 /** 
  *
- * Copyright (c) 2009-2010, Kitty Barnett
+ * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index b9a720981..717847f1d 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -660,16 +660,15 @@ bool RlvHandler::canSit(LLViewerObject* pObj, const LLVector3& posOffset /*= LLV
 	//   - not prevented from sitting
 	//   - not prevented from standing up or not currently sitting
 	//   - not standtp restricted or not currently sitting (if the user is sitting and tried to sit elsewhere the tp would just kick in)
-	//   - [regular sit] not @sittp=n or @fartouch=n restricted or if they clicked on a point within 1.5m of the avie's current position
-	//   - [force sit] not @sittp=n restricted by a *different* object than the one that issued the command or the object is within 1.5m
+	//   - not a regular sit (i.e. due to @sit:<uuid>=force)
+	//   - not @sittp=n or @fartouch=n restricted or if they clicked on a point within 1.5m of the avie's current position
 	return
 		( (pObj) && (LL_PCODE_VOLUME == pObj->getPCode()) ) &&
 		(!hasBehaviour(RLV_BHVR_SIT)) && 
 		( ((!hasBehaviour(RLV_BHVR_UNSIT)) && (!hasBehaviour(RLV_BHVR_STANDTP))) || 
 		  ((isAgentAvatarValid()) && (!gAgentAvatarp->isSitting())) ) &&
-		( ((NULL == getCurrentCommand() || (RLV_BHVR_SIT != getCurrentCommand()->getBehaviourType()))
-			? ((!hasBehaviour(RLV_BHVR_SITTP)) && (!hasBehaviour(RLV_BHVR_FARTOUCH)))	// [regular sit]
-			: (!hasBehaviourExcept(RLV_BHVR_SITTP, getCurrentObject()))) ||				// [force sit]
+		( ( (NULL != getCurrentCommand()) && (RLV_BHVR_SIT == getCurrentCommand()->getBehaviourType()) ) ||
+		  ( (!hasBehaviour(RLV_BHVR_SITTP)) && (!hasBehaviour(RLV_BHVR_FARTOUCH)) ) ||
 		  (dist_vec_squared(gAgent.getPositionGlobal(), pObj->getPositionGlobal() + LLVector3d(posOffset)) < 1.5f * 1.5f) );
 }
 
@@ -934,7 +933,7 @@ bool RlvHandler::redirectChatOrEmote(const std::string& strUTF8Text) const
 				case LLAssetType::AT_BODYPART:
 				case LLAssetType::AT_CLOTHING:
 					{
-						LLViewerWearable* pWearable = gAgent.getWearableFromWearableItem(pItem->getUUID());
+						LLWearable* pWearable = gAgent.getWearableFromWearableItem(pItem->getUUID());
 						if ( (pWearable) && (!isRemovable(pWearable->getType())) )
 							return false;	// If one wearable in the folder is non-removeable then the entire folder should be
 					}
@@ -1055,9 +1054,15 @@ BOOL RlvHandler::setEnabled(BOOL fEnable)
 			
 		// Set up RlvUIEnabler
 		RlvUIEnabler::getInstance();
+
+		/* Singu Note: Off!
+		// Reset to show assertions if the viewer version changed
+		if (gSavedSettings.getString("LastRunVersion") != gLastRunVersion)
+			gSavedSettings.setBOOL("RLVaShowAssertionFailures", TRUE);
+		*/
 	}
 
-	return m_fEnabled;		// Return enabled/disabled state
+	return m_fEnabled;
 }
 
 BOOL RlvHandler::canDisable()
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index 7c8289c66..6415c3ef5 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -34,6 +34,9 @@ public:
 
 	// --------------------------------
 
+	/*
+	 * Rule checking functions
+	 */
 	// NOTE: - to check @detach=n    -> (see RlvAttachmentLocks)
 	//       - to check @addattach=n -> (see RlvAttachmentLocks)
 	//       - to check @remattach=n -> (see RlvAttachmentLocks)
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index c952c0501..875a68863 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -1005,6 +1005,41 @@ void RlvForceWear::done()
 	RLV_ASSERT( (m_addWearables.empty()) && (m_addAttachments.empty()) && (m_addGestures.empty()) );
 }
 
+// Checked: 2010-02-17 (RLVa-1.1.0o) | Modified: RLVa-1.1.0o
+/*
+void RlvForceWear::onWearableArrived(LLWearable* pWearable, void* pParam)
+{
+	#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+	// If this wearable will end up replacing a currently worn one that belongs to a composite folder then we need to detach the composite
+	LLViewerInventoryCategory* pFolder = NULL;
+	if ( (RlvSettings::getEnableComposites()) && (pWearable) && (gAgent.getWearable(pWearable->getType())) )
+	{
+		// If we're just rewearing the same item we're already wearing then we're not replacing a composite folder
+		LLWearableHoldingPattern* pWearData = (LLWearableHoldingPattern*)pParam; LLUUID idItem;
+		for (LLWearableHoldingPattern::found_list_t::const_iterator itWearable = pWearData->mFoundList.begin();
+				itWearable != pWearData->mFoundList.end(); ++itWearable)
+		{
+			LLFoundData* pFound = *itWearable;
+			if (pWearable->getID() == pFound->mAssetID)
+			{
+				idItem = pFound->mItemID;
+				break;
+			}
+		}
+		if ( (idItem.notNull()) && (idItem != gAgent.getWearableItem(pWearable->getType())) && 
+			 (gRlvHandler.getCompositeInfo(gAgent.getWearableItem(pWearable->getType()), NULL, &pFolder)) )
+		{
+			RlvForceWear rlvWear;
+			rlvWear.forceFolder(pFolder, ACTION_DETACH, FLAG_DEFAULT);
+			rlvWear.done();
+		}
+	}
+	#endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+
+	wear_inventory_category_on_avatar_loop(pWearable, pParam);
+}
+*/
+
 // ============================================================================
 // RlvBehaviourNotifyHandler
 //
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index d9fe645eb..6f448bad2 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -26,8 +26,6 @@
 #include "rlvdefines.h"
 #include "rlvcommon.h"
 
-class LLViewerWearable;
-
 // ============================================================================
 // RlvCommand
 //
diff --git a/indra/newview/rlvinventory.cpp b/indra/newview/rlvinventory.cpp
index 165ea6016..be1113c4e 100644
--- a/indra/newview/rlvinventory.cpp
+++ b/indra/newview/rlvinventory.cpp
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
diff --git a/indra/newview/rlvinventory.h b/indra/newview/rlvinventory.h
index 5a70100ec..6c33ba92d 100644
--- a/indra/newview/rlvinventory.h
+++ b/indra/newview/rlvinventory.h
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index 268d27f98..cc675ee6e 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -33,7 +33,7 @@
 
 std::map<std::string, S32> RlvAttachPtLookup::m_AttachPtLookupMap;
 
-// Checked: 2010-03-02 (RLVa-1.1.3a) | Modified: RLVa-1.2.0a
+// Checked: 2010-03-02 (RLVa-1.2.0a) | Modified: RLVa-1.2.0a
 void RlvAttachPtLookup::initLookupTable()
 {
 	static bool fInitialized = false;
@@ -64,7 +64,7 @@ void RlvAttachPtLookup::initLookupTable()
 	}
 }
 
-// Checked: 2010-03-03 (RLVa-1.1.3a) | Added: RLVa-0.2.2a
+// Checked: 2010-03-03 (RLVa-1.2.0a) | Added: RLVa-0.2.2a
 S32 RlvAttachPtLookup::getAttachPointIndex(const LLViewerJointAttachment* pAttachPt)
 {
 	if (isAgentAvatarValid())
@@ -439,7 +439,7 @@ void RlvAttachmentLocks::removeAttachmentPointLock(S32 idxAttachPt, const LLUUID
 	}
 }
 
-// Checked: 2010-08-22 (RLVa-1.1.3a) | Modified: RLVa-1.2.1a
+// Checked: 2010-08-22 (RLVa-1.2.1a) | Modified: RLVa-1.2.1a
 void RlvAttachmentLocks::updateLockedHUD()
 {
 	if (!isAgentAvatarValid())
@@ -500,7 +500,7 @@ bool RlvAttachmentLockWatchdog::RlvWearInfo::isAddLockedAttachPt(S32 idxAttachPt
 	return (attachPts.find(idxAttachPt) != attachPts.end());
 }
 
-// Checked: 2010-09-23 (RLVa-1.1.3b) | Added: RLVa-1.2.1d
+// Checked: 2010-09-23 (RLVa-1.2.1d) | Added: RLVa-1.2.1d
 void RlvAttachmentLockWatchdog::RlvWearInfo::dumpInstance() const
 {
 	const LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
@@ -635,7 +635,7 @@ void RlvAttachmentLockWatchdog::detach(S32 idxAttachPt, const uuid_vec_t& idsAtt
 	}
 }
 
-// Checked: 2010-09-23 (RLVa-1.1.3a) | Modified: RLVa-1.2.1d
+// Checked: 2010-09-23 (RLVa-1.2.1d) | Modified: RLVa-1.2.1d
 void RlvAttachmentLockWatchdog::onAttach(const LLViewerObject* pAttachObj, const LLViewerJointAttachment* pAttachPt)
 {
 	S32 idxAttachPt = RlvAttachPtLookup::getAttachPointIndex(pAttachObj);
@@ -742,7 +742,7 @@ void RlvAttachmentLockWatchdog::onAttach(const LLViewerObject* pAttachObj, const
 	RlvBehaviourNotifyHandler::onAttach(pAttachPt, fAttachAllowed);
 }
 
-// Checked: 2010-07-28 (RLVa-1.1.3a) | Modified: RLVa-1.2.0i
+// Checked: 2010-07-28 (RLVa-1.2.0i) | Modified: RLVa-1.2.0i
 void RlvAttachmentLockWatchdog::onDetach(const LLViewerObject* pAttachObj, const LLViewerJointAttachment* pAttachPt)
 {
 	S32 idxAttachPt = RlvAttachPtLookup::getAttachPointIndex(pAttachPt);
@@ -852,7 +852,7 @@ BOOL RlvAttachmentLockWatchdog::onTimer()
 	return ( (m_PendingAttach.empty()) && (m_PendingDetach.empty()) && (m_PendingWear.empty()) );
 }
 
-// Checked: 2010-07-28 (RLVa-1.1.3a) | Modified: RLVa-1.2.0i
+// Checked: 2010-07-28 (RLVa-1.2.0i) | Modified: RLVa-1.2.0i
 void RlvAttachmentLockWatchdog::onWearAttachment(const LLUUID& idItem, ERlvWearMask eWearAction)
 {
 	// We only need to keep track of user wears if there's actually anything locked
@@ -931,7 +931,7 @@ void RlvWearableLocks::addWearableTypeLock(LLWearableType::EType eType, const LL
 		m_WearableTypeAdd.insert(std::pair<LLWearableType::EType, LLUUID>(eType, idRlvObj));
 }
 
-// Checked: 2010-03-19 (RLVa-1.1.3b) | Added: RLVa-1.2.0a
+// Checked: 2010-03-19 (RLVa-1.2.0c) | Added: RLVa-1.2.0a
 bool RlvWearableLocks::canRemove(LLWearableType::EType eType) const
 {
 	// NOTE: we return TRUE if the wearable type has at least one wearable that can be removed by the user
@@ -1162,7 +1162,7 @@ bool RlvFolderLocks::getLockedFolders(const folderlock_source_t& lockSource, LLI
 	return cntFolders != lockFolders.count();
 }
 
-// Checked: 2011-03-27 (RLVa-1.3.0g) | Added: RLVa-1.3.0g
+// Checked: 2011-11-26 (RLVa-1.5.4a) | Modified: RLVa-1.5.4a
 bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::item_array_t& lockItems) const
 {
 	S32 cntItems = lockItems.count();
diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h
index 292c376c7..31180aad9 100644
--- a/indra/newview/rlvlocks.h
+++ b/indra/newview/rlvlocks.h
@@ -3,10 +3,10 @@
  * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -298,7 +298,7 @@ public:
 	// Specifies options for the folder lock
 	enum ELockPermission { PERM_ALLOW = 0x1, PERM_DENY = 0x2, PERM_MASK_ANY = 0x3 };
 	enum ELockScope	{ SCOPE_NODE, SCOPE_SUBTREE } ;
-protected:
+
 	struct folderlock_descr_t
 	{
 		LLUUID				idRlvObj;
@@ -394,13 +394,13 @@ inline LLViewerJointAttachment* RlvAttachPtLookup::getAttachPoint(S32 idxAttachP
 	return (isAgentAvatarValid()) ? get_if_there(gAgentAvatarp->mAttachmentPoints, idxAttachPt, (LLViewerJointAttachment*)NULL) : NULL;
 }
 
-// Checked: 2010-03-03 (RLVa-1.1.3a) | Modified: RLVa-0.2.0d
+// Checked: 2010-03-03 (RLVa-1.2.0a) | Modified: RLVa-0.2.0d
 inline LLViewerJointAttachment* RlvAttachPtLookup::getAttachPoint(const std::string& strText)
 {
 	return (isAgentAvatarValid()) ? get_if_there(gAgentAvatarp->mAttachmentPoints, getAttachPointIndex(strText), (LLViewerJointAttachment*)NULL) : NULL;
 }
 
-// Checked: 2010-03-03 (RLVa-1.1.3a) | Modified: RLVa-1.0.1b
+// Checked: 2010-03-03 (RLVa-1.2.0a) | Modified: RLVa-1.0.1b
 inline LLViewerJointAttachment* RlvAttachPtLookup::getAttachPoint(const LLInventoryItem* pItem)
 {
 	return (isAgentAvatarValid()) ? get_if_there(gAgentAvatarp->mAttachmentPoints, getAttachPointIndex(pItem), (LLViewerJointAttachment*)NULL) : NULL;
@@ -425,11 +425,11 @@ inline S32 RlvAttachPtLookup::getAttachPointIndex(const LLViewerObject* pObj)
 // RlvAttachmentLocks inlined member functions
 //
 
-// Checked: 2011-03-27 (RLVa-1.3.0g) | Modified: RLVa-1.3.0g
+// Checked: 2011-05-22 (RLVa-1.3.1b) | Modified: RLVa-1.3.1b
 inline ERlvWearMask RlvAttachmentLocks::canAttach(const LLInventoryItem* pItem, LLViewerJointAttachment** ppAttachPtOut /*=NULL*/) const
 {
 	// The specified item can be attached if:
-	//   - it doesn't specify an attachment point
+	//   - it doesn't specify an attachment point and there is at least one attachment point that can be attached to
 	//   - the attachment point it specifies can be attached to
 	LLViewerJointAttachment* pAttachPt = RlvAttachPtLookup::getAttachPoint(pItem);
 	if (ppAttachPtOut)
@@ -628,13 +628,12 @@ inline bool RlvFolderLocks::canRemoveFolder(const LLUUID& idFolder) const
 // Checked: 2011-03-29 (RLVa-1.3.0g) | Added: RLVa-1.3.0g
 inline bool RlvFolderLocks::canRenameFolder(const LLUUID& idFolder) const
 {
-	/* Block renaming a folder if:
+	// Block renaming a folder if:
 	//   - the folder (or one of its descendents) is explicitly locked by:
 	//		-> a "shared path" => renaming the folder would change the shared path and hence invalidate the lock
-	//		-> an attachment point \
+	//		-> an attachment point -|
 	//		-> an attachment        |--> renaming the folder to a "dot" (=invisible) folder would invalidate the lock
-	//		-> a wearable type     /
-	*/
+	//		-> a wearable type     -|
 	return !hasLockedFolderDescendent(idFolder, ST_SHAREDPATH | ST_ATTACHMENT | ST_ATTACHMENTPOINT | ST_WEARABLETYPE, PERM_MASK_ANY, RLV_LOCK_ANY, true);
 }
 

From 9e82297303df3ef3d9d7756676c9017f30c579e8 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 00:31:40 -0500
Subject: [PATCH 08/25] [RLVa] rlvfloaterbehaviour.* -> rlvfloaters.*

---
 indra/newview/CMakeLists.txt                  |  4 +-
 indra/newview/llviewermenu.cpp                |  2 +-
 ...lvfloaterbehaviour.cpp => rlvfloaters.cpp} | 56 +++++++------------
 .../{rlvfloaterbehaviour.h => rlvfloaters.h}  | 34 +++++------
 4 files changed, 38 insertions(+), 58 deletions(-)
 rename indra/newview/{rlvfloaterbehaviour.cpp => rlvfloaters.cpp} (91%)
 rename indra/newview/{rlvfloaterbehaviour.h => rlvfloaters.h} (77%)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4772df0c4..fbcc7c4d4 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -577,7 +577,7 @@ set(viewer_SOURCE_FILES
     rlvactions.cpp
     rlvcommon.cpp
     rlvextensions.cpp
-    rlvfloaterbehaviour.cpp
+    rlvfloaters.cpp
     rlvhandler.cpp
     rlvhelper.cpp
     rlvinventory.cpp
@@ -1105,7 +1105,7 @@ set(viewer_HEADER_FILES
     rlvcommon.h
     rlvdefines.h
     rlvextensions.h
-    rlvfloaterbehaviour.h
+    rlvfloaters.h
     rlvhandler.h
     rlvhelper.h
     rlvinventory.h
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index b70001718..051a96329 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -209,7 +209,7 @@ void init_debug_xui_menu(LLMenuGL* menu);
 void init_debug_avatar_menu(LLMenuGL* menu);
 // [RLVa:KB]
 #include "rlvhandler.h"
-#include "rlvfloaterbehaviour.h"
+#include "rlvfloaters.h"
 #include "rlvlocks.h"
 void init_debug_rlva_menu(LLMenuGL* menu);
 // [/RLVa:KB]
diff --git a/indra/newview/rlvfloaterbehaviour.cpp b/indra/newview/rlvfloaters.cpp
similarity index 91%
rename from indra/newview/rlvfloaterbehaviour.cpp
rename to indra/newview/rlvfloaters.cpp
index b8c15214d..68f3dc2c1 100644
--- a/indra/newview/rlvfloaterbehaviour.cpp
+++ b/indra/newview/rlvfloaters.cpp
@@ -1,12 +1,12 @@
 /** 
  *
- * Copyright (c) 2009-2010, Kitty Barnett
+ * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt 
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -23,7 +23,7 @@
 #include "llvoavatarself.h"
 #include "lluictrlfactory.h"
 
-#include "rlvfloaterbehaviour.h"
+#include "rlvfloaters.h"
 #include "rlvhelper.h"
 #include "rlvhandler.h"
 #include "rlvlocks.h"
@@ -32,7 +32,8 @@
 // Helper functions
 //
 
-// Checked: 2010-03-11 (RLVa-1.1.3b) | Modified: RLVa-1.2.0g
+
+// Checked: 2010-03-11 (RLVa-1.2.0a) | Modified: RLVa-1.2.0g
 std::string rlvGetItemNameFromObjID(const LLUUID& idObj, bool fIncludeAttachPt = true)
 {
 	const LLViewerObject* pObj = gObjectList.findObject(idObj);
@@ -69,6 +70,7 @@ bool rlvGetShowException(ERlvBehaviour eBhvr)
 
 // ============================================================================
 // RlvFloaterBehaviours member functions
+//
 
 // Checked: 2010-04-18 (RLVa-1.3.1c) | Modified: RLVa-1.2.0e
 void RlvFloaterBehaviours::onOpen()
@@ -85,23 +87,11 @@ void RlvFloaterBehaviours::onClose(bool fQuitting)
 	LLFloater::onClose(fQuitting);
 }
 
-RlvFloaterBehaviours::RlvFloaterBehaviours(const LLSD& key) 
-	: LLFloater(std::string("rlvBehaviours"))
+RlvFloaterBehaviours::RlvFloaterBehaviours(const LLSD& key) : LLFloater(std::string("rlvBehaviours"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_rlv_behaviours.xml");
 }
 
-
-void RlvFloaterBehaviours::toggle(void*)
-{
-	RlvFloaterBehaviours::toggleInstance();
-}
-
-BOOL RlvFloaterBehaviours::visible(void*)
-{
-	return RlvFloaterBehaviours::instanceVisible();
-}
-
 // Checked: 2010-04-18 (RLVa-1.3.1c) | Modified: RLVa-1.2.0e
 void RlvFloaterBehaviours::onAvatarNameLookup(const LLUUID& idAgent, const LLAvatarName& avName)
 {
@@ -148,8 +138,8 @@ void RlvFloaterBehaviours::onBtnCopyToClipboard()
 		}
 	}
 
-	LLWString text = utf8str_to_wstring(strRestrictions.str());
-	gClipboard.copyFromSubstring(text,0,text.length());
+	LLWString wstrRestrictions = utf8str_to_wstring(strRestrictions.str());
+	gClipboard.copyFromSubstring(wstrRestrictions, 0, wstrRestrictions.length());
 }
 
 // Checked: 2011-05-23 (RLVa-1.3.1c) | Modified: RLVa-1.3.1c
@@ -250,7 +240,7 @@ void RlvFloaterBehaviours::refreshAll()
 // RlvFloaterLocks member functions
 //
 
-// Checked: 2010-03-11 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
+// Checked: 2010-03-11 (RLVa-1.2.0)
 void RlvFloaterLocks::onOpen()
 {
 	m_ConnRlvCommand = gRlvHandler.setCommandCallback(boost::bind(&RlvFloaterLocks::onRlvCommand, this, _1, _2));
@@ -258,28 +248,24 @@ void RlvFloaterLocks::onOpen()
 	refreshAll();
 }
 
-// Checked: 2010-03-11 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
+// Checked: 2010-03-11 (RLVa-1.2.0)
 void RlvFloaterLocks::onClose(bool fQuitting)
 {
 	m_ConnRlvCommand.disconnect();
 	LLFloater::onClose(fQuitting);
 }
 
-RlvFloaterLocks::RlvFloaterLocks(const LLSD& key) 
-	: LLFloater(std::string("rlvLocks"))
+RlvFloaterLocks::RlvFloaterLocks(const LLSD& key) : LLFloater("rlvLocks")
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_rlv_locks.xml");
 }
 
-
-void RlvFloaterLocks::toggle(void*)
+// Checked: 2012-07-14 (RLVa-1.4.7)
+BOOL RlvFloaterLocks::postBuild()
 {
-	RlvFloaterLocks::toggleInstance();
-}
+	getChild<LLUICtrl>("refresh_btn")->setCommitCallback(boost::bind(&RlvFloaterLocks::refreshAll, this));
 
-BOOL RlvFloaterLocks::visible(void*)
-{
-	return RlvFloaterLocks::instanceVisible();
+	return TRUE;
 }
 
 // Checked: 2010-03-11 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
@@ -303,12 +289,10 @@ void RlvFloaterLocks::onRlvCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet)
 	}
 }
 
-// Checked: 2010-03-18 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
+// Checked: 2010-03-18 (RLVa-1.2.0)
 void RlvFloaterLocks::refreshAll()
 {
-	LLCtrlListInterface* pLockList = childGetListInterface("lock_list");
-	if (!pLockList)
-		return;
+	LLScrollListCtrl* pLockList = getChild<LLScrollListCtrl>("lock_list");
 	pLockList->operateOnAll(LLCtrlListInterface::OP_DELETE);
 
 	if (!isAgentAvatarValid())
diff --git a/indra/newview/rlvfloaterbehaviour.h b/indra/newview/rlvfloaters.h
similarity index 77%
rename from indra/newview/rlvfloaterbehaviour.h
rename to indra/newview/rlvfloaters.h
index caac9d3bc..33b8ed9fa 100644
--- a/indra/newview/rlvfloaterbehaviour.h
+++ b/indra/newview/rlvfloaters.h
@@ -1,12 +1,12 @@
 /** 
  *
- * Copyright (c) 2009-2010, Kitty Barnett
+ * Copyright (c) 2009-2011, Kitty Barnett
  * 
  * The source code in this file is provided to you under the terms of the 
- * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * GNU Lesser General Public License, version 2.1, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
- * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt 
- * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ * PARTICULAR PURPOSE. Terms of the LGPL can be found in doc/LGPL-licence.txt 
+ * in this distribution, or online at http://www.gnu.org/licenses/lgpl-2.1.txt
  * 
  * By copying, modifying or distributing this software, you acknowledge that
  * you have read and understood your obligations described above, and agree to 
@@ -29,7 +29,7 @@
 class RlvFloaterBehaviours : public LLFloater, public LLFloaterSingleton<RlvFloaterBehaviours>
 {
 	friend class LLUISingleton<RlvFloaterBehaviours, VisibilityPolicy<LLFloater> >;
-
+private:
 	RlvFloaterBehaviours(const LLSD& sdKey);
 
 	/*
@@ -39,9 +39,9 @@ public:
 	/*virtual*/ void onOpen();
 	/*virtual*/ void onClose(bool fQuitting);
 	/*virtual*/ BOOL postBuild();
-	
-	static void toggle(void* a=NULL);
-	static BOOL visible(void* a=NULL);
+
+	static void toggle(void*) { return toggleInstance(); }
+	static BOOL visible(void*) { return instanceVisible(); }
 
 	/*
 	 * Member functions
@@ -67,29 +67,25 @@ protected:
 class RlvFloaterLocks : public LLFloater, public LLFloaterSingleton<RlvFloaterLocks>
 {
 	friend class LLUISingleton<RlvFloaterLocks, VisibilityPolicy<LLFloater> >;
-
+private:
 	RlvFloaterLocks(const LLSD& sdKey);
 
 	/*
 	 * LLFloater overrides
 	 */
 public:
-	virtual void onOpen();
-	virtual void onClose(bool fQuitting);
-	
-	static void toggle(void* a=NULL);
-	static BOOL visible(void* a=NULL);
+	/*virtual*/ void onOpen();
+	/*virtual*/ void onClose(bool fQuitting);
+	/*virtual*/ BOOL postBuild();
 
-	/*
-	 * Event handlers
-	 */
-protected:
-	void onRlvCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet);
+	static void toggle(void*) { return toggleInstance(); }
+	static BOOL visible(void*) { return instanceVisible(); }
 
 	/*
 	 * Member functions
 	 */
 protected:
+	void onRlvCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet);
 	void refreshAll();
 
 	/*

From 4dcf8f3f45d55f2064a3034bffaed3b267b2bbd2 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 03:16:35 -0500
Subject: [PATCH 09/25] [RLVa] Removal of z offset restrictions

---
 indra/newview/app_settings/settings_rlv.xml | 11 --------
 indra/newview/llvoavatarself.cpp            | 30 +++++++--------------
 indra/newview/rlvcommon.cpp                 |  3 ---
 indra/newview/rlvdefines.h                  | 18 ++++++-------
 indra/newview/rlvhandler.cpp                | 16 ++---------
 5 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/indra/newview/app_settings/settings_rlv.xml b/indra/newview/app_settings/settings_rlv.xml
index ca850aaca..09b3d15fd 100644
--- a/indra/newview/app_settings/settings_rlv.xml
+++ b/indra/newview/app_settings/settings_rlv.xml
@@ -57,17 +57,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-  <key>RestrainedLoveOffsetAvatarZ</key>
-   <map>
-     <key>Comment</key>
-    <string>Offset the avatar.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
-    <real>0.0</real>
-  </map>
   <key>RestrainedLoveReplaceWhenFolderBeginsWith</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index e01998284..6f0a4bd9f 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -978,6 +978,7 @@ void LLVOAvatarSelf::idleUpdateTractorBeam()
 		}
 	}
 }
+
 //-----------------------------------------------------------------------------
 // restoreMeshData()
 //-----------------------------------------------------------------------------
@@ -1226,7 +1227,6 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
 				gRlvAttachmentLocks.updateLockedHUD();
 		}
 // [/RLVa:KB]
-
 	}
 
 	return attachment;
@@ -1239,24 +1239,20 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
 
 // [RLVa:KB] - Checked: 2010-03-05 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
 	// NOTE: RLVa event handlers should be invoked *before* LLVOAvatar::detachObject() calls LLViewerJointAttachment::removeObject()
-	
+	if (rlv_handler_t::isEnabled())
 	{
 		for (attachment_map_t::const_iterator itAttachPt = mAttachmentPoints.begin(); itAttachPt != mAttachmentPoints.end(); ++itAttachPt)
 		{
 			const LLViewerJointAttachment* pAttachPt = itAttachPt->second;
 			if (pAttachPt->isObjectAttached(viewer_object))
 			{
-				if (rlv_handler_t::isEnabled())
-				{
-					RlvAttachmentLockWatchdog::instance().onDetach(viewer_object, pAttachPt);
-					gRlvHandler.onDetach(viewer_object, pAttachPt);
-				}
-				if (mAttachmentSignal)
-				{
-					(*mAttachmentSignal)(viewer_object, pAttachPt, ACTION_DETACH);
-				}
+				RlvAttachmentLockWatchdog::instance().onDetach(viewer_object, pAttachPt);
+				gRlvHandler.onDetach(viewer_object, pAttachPt);
+			}
+			if (mAttachmentSignal)
+			{
+				(*mAttachmentSignal)(viewer_object, pAttachPt, ACTION_DETACH);
 			}
-			break;
 		}
 	}
 // [/RLVa:KB]
@@ -1525,6 +1521,7 @@ BOOL LLVOAvatarSelf::isLocalTextureDataFinal(const LLViewerTexLayerSet* layerset
 	return FALSE;
 }
 
+
 BOOL LLVOAvatarSelf::isAllLocalTextureDataFinal() const
 {
 	const U32 desired_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel"); 
@@ -3122,6 +3119,7 @@ bool LLVOAvatarSelf::sendAppearanceMessage(LLMessageSystem *mesgsys) const
 	return success;
 }
 
+
 //------------------------------------------------------------------------
 // needsRenderBeam()
 //------------------------------------------------------------------------
@@ -3257,14 +3255,6 @@ LLVector3 LLVOAvatarSelf::getLegacyAvatarOffset() const
 	static LLCachedControl<F32> z_off("AscentAvatarZModifier");
 	LLVector3 offset(x_off,y_off,z_off);
 
-// [RLVa:KB] Custom blah blah
-	if(rlv_handler_t::isEnabled())
-	{
-		F32 rlva_z_offs = RlvSettings::getAvatarOffsetZ();
-		if(fabs(rlva_z_offs) > F_APPROXIMATELY_ZERO)
-			offset.mV[VZ] = rlva_z_offs;
-	}
-// [/RLVa:KB]
 	if(on_pose_stand)
 		offset.mV[VZ] += 7.5f;
 
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index c274daa7e..b8cb2c05b 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -104,9 +104,6 @@ void RlvSettings::initClass()
 			gSavedPerAccountSettings.getControl(RLV_SETTING_LOGINLASTLOCATION)->setHiddenFromSettingsEditor(true);
 #endif // RLV_EXTENSION_STARTLOCATION
 
-		if (gSavedSettings.controlExists(RLV_SETTING_AVATAROFFSET_Z))
-			gSavedSettings.getControl(RLV_SETTING_AVATAROFFSET_Z)->getSignal()->connect(boost::bind(&onChangedAvatarOffset, _2));
-
 		if (gSavedSettings.controlExists(RLV_SETTING_TOPLEVELMENU))
 			gSavedSettings.getControl(RLV_SETTING_TOPLEVELMENU)->getSignal()->connect(boost::bind(&onChangedMenuLevel));
 
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 58bf384c8..38a5264a5 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -238,9 +238,9 @@ enum ERlvParamType {
 };
 
 enum ERlvCmdRet {
-	RLV_RET_UNKNOWN     = 0x0000,	// Unknown error (should only be used internally)
+	RLV_RET_UNKNOWN		= 0x0000,	// Unknown error (should only be used internally)
 	RLV_RET_RETAINED,				// Command was retained
-	RLV_RET_SUCCESS     = 0x0100,	// Command executed succesfully
+	RLV_RET_SUCCESS		= 0x0100,	// Command executed succesfully
 	RLV_RET_SUCCESS_UNSET,			// Command executed succesfully (RLV_TYPE_REMOVE for an unrestricted behaviour)
 	RLV_RET_SUCCESS_DUPLICATE,		// Command executed succesfully (RLV_TYPE_ADD for an already restricted behaviour)
 	RLV_RET_SUCCESS_DELAYED,		// Command parsed valid but will execute at a later time
@@ -252,6 +252,7 @@ enum ERlvCmdRet {
 	RLV_RET_FAILED_DISABLED,		// Command failed (command disabled by user)
 	RLV_RET_FAILED_UNKNOWN,			// Command failed (unknown command)
 	RLV_RET_FAILED_NOSHAREDROOT,	// Command failed (missing #RLV)
+	RLV_RET_DEPRECATED				// Command has been deprecated
 };
 
 enum ERlvExceptionCheck
@@ -263,17 +264,17 @@ enum ERlvExceptionCheck
 
 enum ERlvLockMask
 {
-	RLV_LOCK_ADD    = 0x01,
-	RLV_LOCK_REMOVE = 0x02,
-	RLV_LOCK_ANY    = RLV_LOCK_ADD | RLV_LOCK_REMOVE
+	RLV_LOCK_ADD	= 0x01,
+	RLV_LOCK_REMOVE	= 0x02,
+	RLV_LOCK_ANY	= RLV_LOCK_ADD | RLV_LOCK_REMOVE
 };
 
 enum ERlvWearMask
 {
-	RLV_WEAR_LOCKED  = 0x00,		// User can not wear the item at all
-	RLV_WEAR_ADD     = 0x01,		// User can wear the item in addition to what's already worn
+	RLV_WEAR_LOCKED	 = 0x00,		// User can not wear the item at all
+	RLV_WEAR_ADD	 = 0x01,		// User can wear the item in addition to what's already worn
 	RLV_WEAR_REPLACE = 0x02,		// User can wear the item and replace what's currently worn
-	RLV_WEAR         = 0x03			// Convenience: combines RLV_WEAR_ADD and RLV_WEAR_REPLACE
+	RLV_WEAR		 = 0x03			// Convenience: combines RLV_WEAR_ADD and RLV_WEAR_REPLACE
 };
 
 enum ERlvAttachGroupType
@@ -293,7 +294,6 @@ enum ERlvAttachGroupType
 
 #define RLV_SETTING_MAIN				"RestrainedLove"
 #define RLV_SETTING_DEBUG				"RestrainedLoveDebug"
-#define RLV_SETTING_AVATAROFFSET_Z		"RestrainedLoveOffsetAvatarZ"
 #define RLV_SETTING_CANOOC				"RestrainedLoveCanOOC"
 #define RLV_SETTING_FORBIDGIVETORLV		"RestrainedLoveForbidGiveToRLV"
 #define RLV_SETTING_NOSETENV			"RestrainedLoveNoSetEnv"
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 717847f1d..9a9a059ed 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1606,20 +1606,8 @@ ERlvCmdRet RlvHandler::processForceCommand(const RlvCommand& rlvCmd) const
 		case RLV_BHVR_SIT:			// @sit:<option>=force
 			eRet = onForceSit(rlvCmd);
 			break;
-		case RLV_BHVR_ADJUSTHEIGHT:	// @adjustheight:<options>=force		- Checked: 2011-03-28 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
-			{
-				RlvCommandOptionAdjustHeight rlvCmdOption(rlvCmd);
-				VERIFY_OPTION(rlvCmdOption.isValid());
-				if (isAgentAvatarValid())
-				{
-					F32 nValue = (rlvCmdOption.m_nPelvisToFoot - gAgentAvatarp->getPelvisToFoot()) * rlvCmdOption.m_nPelvisToFootDeltaMult;
-					nValue += rlvCmdOption.m_nPelvisToFootOffset;
-					if (!gAgentAvatarp->isUsingServerBakes())
-						gSavedSettings.setF32(RLV_SETTING_AVATAROFFSET_Z, llclamp<F32>(nValue, -1.0f, 1.0f));
-					else
-						eRet = RLV_RET_FAILED_DISABLED;
-				}
-			}
+		case RLV_BHVR_ADJUSTHEIGHT:	// @adjustheight:<options>=force
+			eRet = RLV_RET_DEPRECATED;
 			break;
 		case RLV_BHVR_TPTO:			// @tpto:<option>=force					- Checked: 2011-03-28 (RLVa-1.3.0f) | Modified: RLVa-1.3.0f
 			{

From 88ae36f4e1f8f656ea0d9498367c673b33fe8f34 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 04:27:38 -0500
Subject: [PATCH 10/25] [RLVa] Forced TPRequest response is now supported!

---
 indra/newview/llviewermessage.cpp | 114 +++++++++++++++++++-----------
 indra/newview/rlvactions.cpp      |  30 ++++++++
 indra/newview/rlvactions.h        |  39 +++++++++-
 indra/newview/rlvcommon.h         |   1 -
 indra/newview/rlvdefines.h        |   4 +-
 indra/newview/rlvhandler.cpp      |   6 +-
 indra/newview/rlvhandler.h        |   7 --
 indra/newview/rlvhelper.cpp       |   8 +--
 indra/newview/rlvhelper.h         |  13 +---
 9 files changed, 153 insertions(+), 69 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0978d2b8b..57316f90c 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2331,7 +2331,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 //					&& !is_muted // Singu Note: Never if muted
 //					&& from_id.notNull() //not a system message
 //					&& to_id.notNull()) //not global message
-// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0) | Modified: RLVa-1.3.0c
+// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
 		else if (offline == IM_ONLINE
 					&& is_do_not_disturb
 					&& !is_muted // Singu Note: Never if muted
@@ -2485,16 +2485,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				mute_im = true;
 			}
 
-// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
-			// Don't block offline IMs, or IMs from Lindens
-			if ( (rlv_handler_t::isEnabled()) && (offline != IM_OFFLINE) && (!RlvActions::canReceiveIM(from_id)) && (!is_linden) )
-			{
-				if (!mute_im)
-					RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM_REMOTE), session_id);
-				message = message.substr(0, message_offset) + RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
-			}
-// [/RLVa:KB]
-
 			std::string saved;
 			if(offline == IM_OFFLINE)
 			{
@@ -2520,6 +2510,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				mute_im = true;
 			}
 */
+
+// [RLVa:KB] - Checked: 2010-11-30 (RLVa-1.3.0)
+			// Don't block offline IMs, or IMs from Lindens
+			if ( (rlv_handler_t::isEnabled()) && (offline != IM_OFFLINE) && (!RlvActions::canReceiveIM(from_id)) && (!is_linden) )
+			{
+				if (!mute_im)
+					RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM_REMOTE), session_id);
+				message = RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
+			}
+// [/RLVa:KB]
+
 			if (!mute_im || is_linden)
 			{
 				gIMMgr->addMessage(
@@ -2747,7 +2748,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				payload["sender_name"] = name;
 				payload["group_id"] = group_id;
 				payload["inventory_name"] = item_name;
-				payload["inventory_offer"] = info ? info->asLLSD() : LLSD();
+				if(info && info->asLLSD())
+				{
+					payload["inventory_offer"] = info->asLLSD();
+				}
 
 				LLSD args;
 				args["SUBJECT"] = subj;
@@ -2872,9 +2876,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				info->forceResponse(IOR_DECLINE);
 			}
 			/* Singu Note: Handle this inside inventory_offer_handler so if the user wants to autoaccept offers, they can while busy.
+			// old logic: busy mode must not affect interaction with objects (STORM-565)
+			// new logic: inventory offers from in-world objects should be auto-declined (CHUI-519)
+			// Singu Note: We should use old logic
 			else if (is_do_not_disturb && dialog != IM_TASK_INVENTORY_OFFERED) // busy mode must not affect interaction with objects (STORM-565)
 			{
-				// Until throttling is implemented, busy mode should reject inventory instead of silently
+				// Until throttling is implemented, do not disturb mode should reject inventory instead of silently
 				// accepting it.  SEE SL-39554
 				info->forceResponse(IOR_DECLINE);
 			}
@@ -3014,7 +3021,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			chat.mFromName = name;
 
 			// Build a link to open the object IM info window.
-			std::string location = ll_safe_string((char*)binary_bucket, binary_bucket_size);
+			std::string location = ll_safe_string((char*)binary_bucket, binary_bucket_size-1);
 
 			if (session_id.notNull())
 			{
@@ -3113,21 +3120,20 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_LURE_USER:
 	case IM_TELEPORT_REQUEST:
 		{
-// [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
-			// If the lure sender is a specific @accepttp exception they will override muted and busy status
-			bool fRlvSummon = (rlv_handler_t::isEnabled()) && (gRlvHandler.isException(RLV_BHVR_ACCEPTTP, from_id));
+// [RLVa:KB] - Checked: 2013-11-08 (RLVa-1.4.9)
+			// If we auto-accept the offer/request then this will override DnD status (but we'll still let the other party know later)
+			bool fRlvAutoAccept = (rlv_handler_t::isEnabled()) &&
+				( ((IM_LURE_USER == dialog) && (RlvActions::autoAcceptTeleportOffer(from_id))) ||
+				  ((IM_TELEPORT_REQUEST == dialog) && (RlvActions::autoAcceptTeleportRequest(from_id))) );
 // [/RLVa:KB]
 
-//			if (is_muted)
-// [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
-			if ( (is_muted) && (!fRlvSummon) )
-// [/RLVa:KB]
+			if (is_muted)
 			{ 
 				return;
 			}
 //			else if (is_do_not_disturb)
-// [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
-			else if ( (is_do_not_disturb)  && (!fRlvSummon) )
+// [RLVa:KB] - Checked: 2013-11-08 (RLVa-1.4.9)
+			else if ( (is_do_not_disturb) && (!fRlvAutoAccept) )
 // [/RLVa:KB]
 			{
 				send_do_not_disturb_message(msg, from_id);
@@ -3187,19 +3193,20 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					}
 				}
 
-// [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Modified: RLVa-1.2.2c
+// [RLVa:KB] - Checked: 2013-11-08 (RLVa-1.4.9)
 				if (rlv_handler_t::isEnabled())
 				{
-					if (IM_TELEPORT_REQUEST != dialog && !gRlvHandler.canTeleportViaLure(from_id))
+					if ( ((IM_LURE_USER == dialog) && (!RlvActions::canAcceptTpOffer(from_id))) ||
+					     ((IM_TELEPORT_REQUEST == dialog) && (!RlvActions::canAcceptTpRequest(from_id))) )
 					{
-						RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_TPLURE_REMOTE));
+						RlvUtil::sendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_TPLUREREQ_REMOTE));
 						if (is_do_not_disturb)
 							send_do_not_disturb_message(msg, from_id);
 						return;
 					}
 
-					// Censor lure message if: 1) restricted from receiving IMs from the sender, or 2) @showloc=n restricted
-					if ( (!RlvActions::canReceiveIM(from_id)) || (IM_TELEPORT_REQUEST != dialog && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+					// Censor lure message if: 1) restricted from receiving IMs from the sender, or 2) teleport offer and @showloc=n restricted
+					if ( (!RlvActions::canReceiveIM(from_id)) || ((IM_LURE_USER == dialog) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))) )
 					{
 						message = RlvStrings::getString(RLV_STRING_HIDDEN);
 					}
@@ -3218,17 +3225,26 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				payload["lure_id"] = session_id;
 				payload["godlike"] = FALSE;
 				payload["region_maturity"] = region_access;
-				//LLNotificationsUtil::add("TeleportOffered", args, payload);
 
-// [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Modified: RLVa-1.2.2c
-				if ( IM_TELEPORT_REQUEST != dialog && (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTTP)) || (fRlvSummon)) )
+				/* Singu TODO: Figure if we should use these
+				if (!canUserAccessDstRegion)
 				{
-					gRlvHandler.setCanCancelTp(false);
-					if (is_do_not_disturb)
-						send_do_not_disturb_message(msg, from_id);
-					LLNotifications::instance().forceResponse(LLNotification::Params("TeleportOffered").payload(payload), 0);
+					LLNotification::Params params("TeleportOffered_MaturityBlocked");
+					params.substitutions = args;
+					params.payload = payload;
+					LLPostponedNotification::add<LLPostponedOfferNotification>(	params, from_id, false);
+					send_simple_im(from_id, LLTrans::getString("TeleportMaturityExceeded"), IM_NOTHING_SPECIAL, session_id);
+					send_simple_im(from_id, LLStringUtil::null, IM_LURE_DECLINED, session_id);
+				}
+				else if (doesUserRequireMaturityIncrease)
+				{
+					LLNotification::Params params("TeleportOffered_MaturityExceeded");
+					params.substitutions = args;
+					params.payload = payload;
+					LLPostponedNotification::add<LLPostponedOfferNotification>(	params, from_id, false);
 				}
 				else
+				*/
 				{
 					/* Singu Note: No default constructor for LLNotification::Params
 					LLNotification::Params params;
@@ -3247,14 +3263,28 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 					params.substitutions = args;
 					params.payload = payload;
-					LLNotifications::instance().add(params);
-					// <edit>
-					if (IM_LURE_USER == dialog)
-						gAgent.showLureDestination(name, region_handle, pos.mV[VX], pos.mV[VY], pos.mV[VZ]);
-					// </edit>
-				}
+
+// [RLVa:KB] - Checked: 20103-11-08 (RLVa-1.4.9)
+					if ( (rlv_handler_t::isEnabled()) && (fRlvAutoAccept) )
+					{
+						if (IM_LURE_USER == dialog)
+							gRlvHandler.setCanCancelTp(false);
+						if (is_do_not_disturb)
+							send_do_not_disturb_message(msg, from_id);
+						LLNotifications::instance().forceResponse(LLNotification::Params(params.name).payload(payload), 0);
+					}
+					else
+					{
+						LLNotifications::instance().add(params);
+
+						// <edit>
+						if (IM_LURE_USER == dialog)
+							gAgent.showLureDestination(name, region_handle, pos.mV[VX], pos.mV[VY], pos.mV[VZ]);
+						// </edit>
+					}
 // [/RLVa:KB]
-				//LLNotificationsUtil::add("TeleportOffered", args, payload);
+//					LLNotifications::instance().add(params);
+				}
 			}
 		}
 		break;
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 454fee692..41ba2d756 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -59,6 +59,30 @@ bool RlvActions::canStartIM(const LLUUID& idRecipient)
 		  ( (!gRlvHandler.hasBehaviour(RLV_BHVR_STARTIMTO)) || (!gRlvHandler.isException(RLV_BHVR_STARTIMTO, idRecipient)) ) );
 }
 
+// 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));
+}
+
 // Checked: 2013-05-10 (RLVa-1.4.9)
 bool RlvActions::hasBehaviour(ERlvBehaviour eBhvr)
 {
@@ -78,4 +102,10 @@ bool RlvActions::hasOpenGroupSession(const LLUUID& idGroup)
 	return (idGroup.notNull()) && (LLIMMgr::instance().hasSession(idGroup));
 }
 
+// Checked: 2013-11-08 (RLVa-1.4.9)
+bool RlvActions::isRlvEnabled()
+{
+	return RlvHandler::isEnabled();
+}
+
 // ============================================================================
diff --git a/indra/newview/rlvactions.h b/indra/newview/rlvactions.h
index b586e2dbc..3f744f874 100644
--- a/indra/newview/rlvactions.h
+++ b/indra/newview/rlvactions.h
@@ -25,8 +25,10 @@
 
 class RlvActions
 {
+	// =============
+	// Communication
+	// =============
 public:
-
 	/*
 	 * Returns true if the user is allowed to receive IMs from the specified sender (can be an avatar or a group)
 	 */
@@ -42,6 +44,36 @@ public:
 	 */
 	static bool canStartIM(const LLUUID& idRecipient);								// @startim and @startimto
 
+	// ========
+	// Movement
+	// ========
+public:
+	/*
+	 * Returns true if the user can accept an incoming teleport offer from the specified avatar
+	 */
+	static bool canAcceptTpOffer(const LLUUID& idSender);
+
+	/*
+	 * Returns true if a teleport offer from the specified avatar should be auto-accepted
+	 * (pass the null UUID to check if all teleport offers should be auto-accepted regardless of sender)
+	 */
+	static bool autoAcceptTeleportOffer(const LLUUID& idSender);
+
+	/*
+	 * Returns true if the user can accept an incoming teleport request from the specified avatar
+	 */
+	static bool canAcceptTpRequest(const LLUUID& idSender);
+
+	/*
+	 * Returns true if a teleport request from the specified avatar should be auto-accepted
+	 * (pass the null UUID to check if all teleport requests should be auto-accepted regardless of requester)
+	 */
+	static bool autoAcceptTeleportRequest(const LLUUID& idRequester);
+
+	// ================
+	// Helper functions
+	// ================
+public:
 	/*
 	 * Convenience function to check for a behaviour without having to include rlvhandler.h. 
 	 * Do NOT call this function if speed is important (i.e. per-frame)
@@ -53,6 +85,11 @@ public:
 	 */
 	static bool hasOpenP2PSession(const LLUUID& idAgent);
 	static bool hasOpenGroupSession(const LLUUID& idGroup);
+
+	/*
+	 * Convenience function to check if RLVa is enabled without having to include rlvhandler.h
+	 */
+	static bool isRlvEnabled();
 };
 
 // ============================================================================
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index a0d5b1c8d..4170263d3 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -80,7 +80,6 @@ template<typename T> inline T rlvGetPerUserSetting(const std::string& strSetting
 class RlvSettings
 {
 public:
-	static F32  getAvatarOffsetZ()				{ return rlvGetSetting<F32>(RLV_SETTING_AVATAROFFSET_Z, 0.0); }
 	static bool getDebug()						{ return rlvGetSetting<bool>(RLV_SETTING_DEBUG, false); }
 	static bool getCanOOC()						{ return fCanOOC; }
 	static bool getForbidGiveToRLV()			{ return rlvGetSetting<bool>(RLV_SETTING_FORBIDGIVETORLV, true); }
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 38a5264a5..c8707ed08 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -155,11 +155,13 @@ enum ERlvBehaviour {
 	RLV_BHVR_TPLM,					// "tplm"
 	RLV_BHVR_TPLOC,					// "tploc"
 	RLV_BHVR_TPLURE,				// "tplure"
+	RLV_BHVR_TPREQUEST,				// "tprequest"
 	RLV_BHVR_VIEWNOTE,				// "viewnote"
 	RLV_BHVR_VIEWSCRIPT,			// "viewscript"
 	RLV_BHVR_VIEWTEXTURE,			// "viewtexture"
 	RLV_BHVR_ACCEPTPERMISSION,		// "acceptpermission"
 	RLV_BHVR_ACCEPTTP,				// "accepttp"
+	RLV_BHVR_ACCEPTTPREQUEST,		// "accepttprequest"
 	RLV_BHVR_ALLOWIDLE,				// "allowidle"
 	RLV_BHVR_EDIT,					// "edit"
 	RLV_BHVR_EDITOBJ,				// "editobj"
@@ -335,7 +337,7 @@ enum ERlvAttachGroupType
 #define RLV_STRING_BLOCKED_STARTCONF		"blocked_startconf"
 #define RLV_STRING_BLOCKED_STARTIM			"blocked_startim"
 #define RLV_STRING_BLOCKED_TELEPORT			"blocked_teleport"
-#define RLV_STRING_BLOCKED_TPLURE_REMOTE	"blocked_tplure_remote"
+#define RLV_STRING_BLOCKED_TPLUREREQ_REMOTE	"blocked_tplurerequest_remote"
 #define RLV_STRING_BLOCKED_VIEWXXX			"blocked_viewxxx"
 
 // ============================================================================
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 9a9a059ed..5461c62c3 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1051,7 +1051,7 @@ BOOL RlvHandler::setEnabled(BOOL fEnable)
 			LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&RlvHandler::onLoginComplete, &gRlvHandler));
 		else
 			gRlvHandler.onLoginComplete();
-			
+
 		// Set up RlvUIEnabler
 		RlvUIEnabler::getInstance();
 
@@ -1328,7 +1328,9 @@ ERlvCmdRet RlvHandler::processAddRemCommand(const RlvCommand& rlvCmd)
 		case RLV_BHVR_RECVIM:				// @recvim[:<uuid>]=n|y				- Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
 		case RLV_BHVR_STARTIM:				// @startim[:<uuid>]=n|y			- Checked: 2011-04-11 (RLVa-1.3.0h) | Added: RLVa-1.3.0h
 		case RLV_BHVR_TPLURE:				// @tplure[:<uuid>]=n|y				- Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
-		case RLV_BHVR_ACCEPTTP:				// @accepttp[:<uuid>]=n|y			- Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+		case RLV_BHVR_TPREQUEST:			// @tprequest[:<uuid>]=n|y			- Checked: 2013-11-08 (RLVa-1.4.9)
+		case RLV_BHVR_ACCEPTTP:				// @accepttp[:<uuid>]=n|y			- Checked: 2009-12-05 (RLVa-1.1.0)
+		case RLV_BHVR_ACCEPTTPREQUEST:		// @accepttprequest[:<uuid>]=n|y    - Checked: 2013-11-08 (RLVa-1.4.9)
 		case RLV_BHVR_TOUCHATTACH:			// @touchattach[:<uuid>=n|y			- Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
 #ifdef RLV_EXTENSION_CMD_TOUCHXXX
 		case RLV_BHVR_TOUCHHUD:				// @touchhud[:<uuid>=n|y			- Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index 6415c3ef5..c5905c5ea 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -98,7 +98,6 @@ public:
 	bool canShowHoverText(const LLViewerObject* pObj) const;									// @showhovertext* command family
 	bool canSit(LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;
 	bool canStand() const;
-	bool canTeleportViaLure(const LLUUID& idAgent) const;
 	bool canTouch(const LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;	// @touch
 	bool filterChat(std::string& strUTF8Text, bool fFilterEmote) const;							// @sendchat, @recvchat and @redirchat
 	bool redirectChatOrEmote(const std::string& strUTF8Test) const;								// @redirchat and @rediremote
@@ -255,12 +254,6 @@ inline bool RlvHandler::canShowHoverText(const LLViewerObject *pObj) const
 			   (isException(RLV_BHVR_SHOWHOVERTEXT, pObj->getID(), RLV_CHECK_PERMISSIVE)) ) );
 }
 
-// Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
-inline bool RlvHandler::canTeleportViaLure(const LLUUID& idAgent) const
-{
-	return ((!hasBehaviour(RLV_BHVR_TPLURE)) || (isException(RLV_BHVR_TPLURE, idAgent))) && (canStand());
-}
-
 inline bool RlvHandler::hasBehaviour(ERlvBehaviour eBhvr, const std::string& strOption) const
 {
 	return hasBehaviourExcept(eBhvr, strOption, LLUUID::null);
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 875a68863..e99f7290b 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -160,12 +160,12 @@ void RlvCommand::initLookupTable()
 		std::string arBehaviours[RLV_BHVR_COUNT] =
 			{
 				"detach", "attach", "addattach", "remattach", "addoutfit", "remoutfit", "sharedwear", "sharedunwear", 
-				"unsharedwear",	"unsharedunwear", "emote", "sendchat", "recvchat", "recvchatfrom", "recvemote", "recvemotefrom",
+				"unsharedwear", "unsharedunwear", "emote", "sendchat", "recvchat", "recvchatfrom", "recvemote", "recvemotefrom",
 				"redirchat", "rediremote", "chatwhisper", "chatnormal", "chatshout", "sendchannel", "sendim", "sendimto",
 				"recvim", "recvimfrom", "startim", "startimto", "permissive", "notify", "showinv", "showminimap", "showworldmap", "showloc",
-				"shownames", "showhovertext", "showhovertexthud", "showhovertextworld", "showhovertextall", "tplm", "tploc", "tplure",
-				"viewnote", "viewscript", "viewtexture", "acceptpermission", "accepttp", "allowidle", "edit", "editobj", "rez", "fartouch",
-				"interact", "touchthis", "touchattach", "touchattachself", "touchattachother", "touchhud", "touchworld", "touchall", 
+				"shownames", "showhovertext", "showhovertexthud", "showhovertextworld", "showhovertextall", "tplm", "tploc", "tplure", "tprequest",
+				"viewnote", "viewscript", "viewtexture", "acceptpermission", "accepttp", "accepttprequest", "allowidle", "edit", "editobj", "rez",
+				"fartouch", "interact", "touchthis", "touchattach", "touchattachself", "touchattachother", "touchhud", "touchworld", "touchall",
 				"touchme", "fly", "setgroup", "unsit", "sit", "sittp", "standtp", "setdebug", "setenv", "alwaysrun", "temprun", "detachme", 
 				"attachover", "attachthis", "attachthisover", "attachthis_except", "detachthis", "detachthis_except", "attachall", 
 				"attachallover", "detachall", "attachallthis", "attachallthis_except", "attachallthisover", "detachallthis", 
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 6f448bad2..e7de1aed4 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -104,7 +104,7 @@ public:
 protected:
 	bool m_fValid;
 };
- 
+
 struct RlvCommandOptionGeneric : public RlvCommandOption
 {
 	explicit RlvCommandOptionGeneric(const std::string& strOption);
@@ -152,15 +152,6 @@ protected:
 	uuid_vec_t m_idItems;
 };
 
-struct RlvCommandOptionAdjustHeight : public RlvCommandOption
-{
-	RlvCommandOptionAdjustHeight(const RlvCommand& rlvCmd);
-
-	F32 m_nPelvisToFoot;
-	F32 m_nPelvisToFootDeltaMult;
-	F32 m_nPelvisToFootOffset;
-};
-
 struct RlvCommandOptionTpTo : public RlvCommandOption
 {
 	RlvCommandOptionTpTo(const RlvCommand& rlvCmd);
@@ -168,7 +159,6 @@ struct RlvCommandOptionTpTo : public RlvCommandOption
 	LLVector3d m_posGlobal;
 };
 
-
 // ============================================================================
 // RlvObject
 //
@@ -443,6 +433,7 @@ inline bool RlvCommand::hasStrictVariant(ERlvBehaviour eBhvr)
 		case RLV_BHVR_RECVIM:
 		case RLV_BHVR_SENDIM:
 		case RLV_BHVR_TPLURE:
+		case RLV_BHVR_TPREQUEST:
 		case RLV_BHVR_SENDCHANNEL:
 			return true;
 		default:

From 02753bfc7dcff32beebe1d3098ed4376ef40f635 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 04:31:34 -0500
Subject: [PATCH 11/25] [RLVa] gRlvHandler.canStand --> RlvActions::canStand

---
 indra/newview/llselectmgr.cpp  | 5 +++--
 indra/newview/llstatusbar.cpp  | 7 ++++---
 indra/newview/llviewermenu.cpp | 9 +++++----
 indra/newview/rlvactions.cpp   | 8 ++++++++
 indra/newview/rlvactions.h     | 9 +++++++++
 indra/newview/rlvcommon.cpp    | 6 +++---
 indra/newview/rlvhandler.cpp   | 7 -------
 indra/newview/rlvhandler.h     | 1 -
 8 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index f16409e32..f655834c1 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -94,6 +94,7 @@
 #include "hippogridmanager.h"
 
 // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
+#include "rlvactions.h"
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -661,7 +662,7 @@ bool LLSelectMgr::enableLinkObjects()
 		}
 	}
 // [RLVa:KB] - Checked: 2011-03-19 (RLVa-1.3.0f) | Modified: RLVa-0.2.0g
-	if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!gRlvHandler.canStand())) )
+	if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!RlvActions::canStand())) )
 	{
 		// Allow only if the avie isn't sitting on any of the selected objects
 		LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
@@ -683,7 +684,7 @@ bool LLSelectMgr::enableUnlinkObjects()
 		!first_editable_object->isAttachment() && !first_editable_object->isPermanentEnforced() &&
 		((root_object == NULL) || !root_object->isPermanentEnforced());
 // [RLVa:KB] - Checked: 2011-03-19 (RLVa-1.3.0f) | Modified: RLVa-0.2.0g
-	if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!gRlvHandler.canStand())) )
+	if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!RlvActions::canStand())) )
 	{
 		// Allow only if the avie isn't sitting on any of the selected objects
 		LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 1bfc7ca9e..602aa594b 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -95,7 +95,8 @@
 #include "hippogridmanager.h"
 
 // [RLVa:KB]
-#include "rlvhandler.h"
+#include "rlvactions.h"
+#include "rlvcommon.h"
 // [/RLVa:KB]
 
 //
@@ -595,7 +596,7 @@ void LLStatusBar::refresh()
 	}
 
 // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
-	if ( (region) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )	// region == NULL if we lose our connection to the grid
+	if ( (region) && (RlvActions::hasBehaviour(RLV_BHVR_SHOWLOC)) )	// region == NULL if we lose our connection to the grid
 	{
 		location_name = llformat("%s (%s) - %s", 
 			RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(), region->getSimAccessString().c_str(), 
@@ -923,7 +924,7 @@ static void onClickScripts(void*)
 static void onClickBuyLand(void*)
 {
 // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
-	if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+	if (RlvActions::isRlvEnabled() && RlvActions::hasBehaviour(RLV_BHVR_SHOWLOC))
 	{
 		return;
 	}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 051a96329..729dd9418 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -207,7 +207,8 @@ void init_debug_rendering_menu(LLMenuGL* menu);
 void init_debug_ui_menu(LLMenuGL* menu);
 void init_debug_xui_menu(LLMenuGL* menu);
 void init_debug_avatar_menu(LLMenuGL* menu);
-// [RLVa:KB]
+// [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1a)
+#include "rlvactions.h"
 #include "rlvhandler.h"
 #include "rlvfloaters.h"
 #include "rlvlocks.h"
@@ -3974,7 +3975,7 @@ class LLLandSit : public view_listener_t
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 // [RLVa:KB] - Checked: 2010-09-28 (RLVa-1.2.1f) | Modified: RLVa-1.2.1f
-		if ( (rlv_handler_t::isEnabled()) && ((!gRlvHandler.canStand()) || (gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
+		if ( (rlv_handler_t::isEnabled()) && ((!RlvActions::canStand()) || (gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
 			return true;
 // [/RLVa:KB]
 
@@ -4670,7 +4671,7 @@ void handle_take_copy()
 	if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return;
 
 // [RLVa:KB] - Checked: 2010-03-07 (RLVa-1.2.0c) | Modified: RLVa-1.2.0a
-	if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canStand()) )
+	if ( (rlv_handler_t::isEnabled()) && (!RlvActions::canStand()) )
 	{
 		// Allow only if the avie isn't sitting on any of the selected objects
 		LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
@@ -6279,7 +6280,7 @@ bool enable_object_stand_up()
 	// 'Object Stand Up' menu item is enabled when agent is sitting on selection
 //	return sitting_on_selection();
 // [RLVa:KB] - Checked: 2010-07-24 (RLVa-1.2.0g) | Added: RLVa-1.2.0g
-	return sitting_on_selection() && ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.canStand()) );
+	return sitting_on_selection() && ( (!rlv_handler_t::isEnabled()) || (RlvActions::canStand()) );
 // [/RLVa:KB]
 }
 
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 41ba2d756..284813638 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -16,6 +16,7 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llimview.h"
+#include "llvoavatarself.h"
 #include "rlvactions.h"
 #include "rlvhandler.h"
 
@@ -83,6 +84,13 @@ bool RlvActions::autoAcceptTeleportRequest(const LLUUID& idRequester)
 	return ((idRequester.notNull()) && (gRlvHandler.isException(RLV_BHVR_ACCEPTTPREQUEST, idRequester))) || (gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTTPREQUEST));
 }
 
+// Checked: 2010-03-07 (RLVa-1.2.0)
+bool RlvActions::canStand()
+{
+	// NOTE: return FALSE only if we're @unsit=n restricted and the avie is currently sitting on something and TRUE for everything else
+	return (!gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || ((isAgentAvatarValid()) && (!gAgentAvatarp->isSitting()));
+}
+
 // Checked: 2013-05-10 (RLVa-1.4.9)
 bool RlvActions::hasBehaviour(ERlvBehaviour eBhvr)
 {
diff --git a/indra/newview/rlvactions.h b/indra/newview/rlvactions.h
index 3f744f874..9b77ed4b6 100644
--- a/indra/newview/rlvactions.h
+++ b/indra/newview/rlvactions.h
@@ -70,6 +70,15 @@ public:
 	 */
 	static bool autoAcceptTeleportRequest(const LLUUID& idRequester);
 
+	// =================
+	// World interaction
+	// =================
+public:
+	/*
+	 * Returns true if the user can stand up (returns true if the user isn't currently sitting)
+	 */
+	static bool canStand();
+
 	// ================
 	// Helper functions
 	// ================
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index b8cb2c05b..9892c4e3c 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -20,16 +20,16 @@
 #include "llavatarnamecache.h"
 #include "llinstantmessage.h"
 #include "llnotificationsutil.h"
+#include "llsdserialize.h"
 #include "lluictrlfactory.h"
-#include "sgversion.h"
 #include "llviewermenu.h"
 #include "llviewerparcelmgr.h"
 #include "llviewermenu.h"
 #include "llviewerregion.h"
 #include "llviewerstats.h"
-#include "llvoavatar.h"
 #include "llworld.h"
 
+#include "rlvactions.h"
 #include "rlvcommon.h"
 #include "rlvhelper.h"
 #include "rlvhandler.h"
@@ -117,7 +117,7 @@ void RlvSettings::initClass()
 	{
 		if ( (!LLApp::isQuitting()) && (gSavedPerAccountSettings.controlExists(RLV_SETTING_LOGINLASTLOCATION)) )
 		{
-			BOOL fValue = (gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)) || (!gRlvHandler.canStand());
+			BOOL fValue = (gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)) || (!RlvActions::canStand());
 			if (gSavedPerAccountSettings.getBOOL(RLV_SETTING_LOGINLASTLOCATION) != fValue)
 			{
 				gSavedPerAccountSettings.setBOOL(RLV_SETTING_LOGINLASTLOCATION, fValue);
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 5461c62c3..9c5b0c332 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -672,13 +672,6 @@ bool RlvHandler::canSit(LLViewerObject* pObj, const LLVector3& posOffset /*= LLV
 		  (dist_vec_squared(gAgent.getPositionGlobal(), pObj->getPositionGlobal() + LLVector3d(posOffset)) < 1.5f * 1.5f) );
 }
 
-// Checked: 2010-03-07 (RLVa-1.2.0c) | Added: RLVa-1.2.0a
-bool RlvHandler::canStand() const
-{
-	// NOTE: return FALSE only if we're @unsit=n restricted and the avie is currently sitting on something and TRUE for everything else
-	return (!hasBehaviour(RLV_BHVR_UNSIT)) || ((isAgentAvatarValid()) && (!gAgentAvatarp->isSitting()));
-}
-
 // Checked: 2010-04-11 (RLVa-1.3.0h) | Modified: RLVa-1.3.0h
 bool RlvHandler::canTouch(const LLViewerObject* pObj, const LLVector3& posOffset /*=LLVector3::zero*/) const
 {
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index c5905c5ea..c672608e9 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -97,7 +97,6 @@ public:
 	bool canEdit(const LLViewerObject* pObj) const;												// @edit and @editobj
 	bool canShowHoverText(const LLViewerObject* pObj) const;									// @showhovertext* command family
 	bool canSit(LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;
-	bool canStand() const;
 	bool canTouch(const LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;	// @touch
 	bool filterChat(std::string& strUTF8Text, bool fFilterEmote) const;							// @sendchat, @recvchat and @redirchat
 	bool redirectChatOrEmote(const std::string& strUTF8Test) const;								// @redirchat and @rediremote

From 9c0d8bbeb13955af600d9ec5393fb4beb47b8d96 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 04:34:12 -0500
Subject: [PATCH 12/25] [RLVa] "blocked_wireframe"? Seems half baked, but it
 compiles.

---
 indra/newview/llviewermenu.cpp | 47 ++++++++++++++++++++++++++++++++--
 indra/newview/rlvdefines.h     |  1 +
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 729dd9418..c51535d7d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -522,6 +522,10 @@ void region_change();
 void parse_simulator_features();
 void custom_selected(void* user_data);
 
+
+void advanced_toggle_wireframe(void*);
+BOOL advanced_check_wireframe(void*);
+
 void reset_vertex_buffers(void *user_data)
 {
 	gPipeline.clearRebuildGroups();
@@ -1471,8 +1475,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 	menu->addChild(new LLMenuItemCallGL("Selected Texture Info", handle_selected_texture_info, NULL, NULL, 'T', MASK_CONTROL|MASK_SHIFT|MASK_ALT));
 	//menu->addChild(new LLMenuItemCallGL("Dump Image List", handle_dump_image_list, NULL, NULL, 'I', MASK_CONTROL|MASK_SHIFT));
 	
-	menu->addChild(new LLMenuItemToggleGL("Wireframe", &gUseWireframe, 
-			'R', MASK_CONTROL|MASK_SHIFT));
+	menu->addChild(new LLMenuItemCheckGL("Wireframe", advanced_toggle_wireframe, NULL, advanced_check_wireframe, NULL, 'R', MASK_CONTROL|MASK_SHIFT));
 
 	LLMenuItemCheckGL* item;
 	item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT);
@@ -1730,6 +1733,46 @@ void init_server_menu(LLMenuGL* menu)
 	menu->createJumpKeys();
 }
 
+//////////////////////
+// TOGGLE WIREFRAME //
+//////////////////////
+
+/*
+class LLAdvancedToggleWireframe : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+*/
+	void advanced_toggle_wireframe(void*)
+	{
+// [RLVa:KB] - Checked: 2013-05-11 (RLVa-1.4.9)
+		bool fRlvBlockWireframe = gRlvAttachmentLocks.hasLockedHUD();
+		if ( (!gUseWireframe) && (fRlvBlockWireframe) )
+		{
+			RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_WIREFRAME);
+		}
+		gUseWireframe = (!gUseWireframe) && (!fRlvBlockWireframe);
+// [/RLVa:KB]
+//		gUseWireframe = !(gUseWireframe);
+//		gWindowResized = TRUE; // Singu Note: We don't use this (yet?)
+		LLPipeline::updateRenderDeferred();
+		gPipeline.resetVertexBuffers();
+//		return true;
+	}
+/*
+};
+
+class LLAdvancedCheckWireframe : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+*/
+	BOOL advanced_check_wireframe(void*)
+	{
+		bool new_value = gUseWireframe;
+		return new_value;
+	}
+//};
+
+
 //-----------------------------------------------------------------------------
 // cleanup_menus()
 //-----------------------------------------------------------------------------
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index c8707ed08..8057b121b 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -339,6 +339,7 @@ enum ERlvAttachGroupType
 #define RLV_STRING_BLOCKED_TELEPORT			"blocked_teleport"
 #define RLV_STRING_BLOCKED_TPLUREREQ_REMOTE	"blocked_tplurerequest_remote"
 #define RLV_STRING_BLOCKED_VIEWXXX			"blocked_viewxxx"
+#define RLV_STRING_BLOCKED_WIREFRAME		"blocked_wireframe"
 
 // ============================================================================
 

From dd35f1bd685fbffafa83cdaeac67203131e458ab Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 04:35:43 -0500
Subject: [PATCH 13/25] [RLVa] Missed sections of canStand update in that last
 commit.

---
 indra/newview/llagent.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index cdacbeb94..973466967 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -103,10 +103,11 @@
 
 #include "lluictrlfactory.h" //For LLUICtrlFactory::getLayeredXMLNode
 
-// [RLVa:KB] - Checked: 2010-09-27 (RLVa-1.1.3b)
+// [RLVa:KB] - Checked: 2011-11-04 (RLVa-1.4.4a)
+#include "rlvactions.h"
 #include "rlvhandler.h"
-#include "rlvinventory.h"
-#include "llattachmentsmgr.h"
+#include "rlvhelper.h"
+#include "rlvui.h"
 // [/RLVa:KB]
 
 #include "NACLantispam.h" // for NaCl Antispam Registry
@@ -826,17 +827,20 @@ void LLAgent::standUp()
 //	setControlFlags(AGENT_CONTROL_STAND_UP);
 // [RLVa:KB] - Checked: 2010-03-07 (RLVa-1.2.0c) | Added: RLVa-1.2.0a
 	// RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking
-	if ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.canStand()) )
+	if ( (!rlv_handler_t::isEnabled()) || (RlvActions::canStand()) )
 	{
 		setControlFlags(AGENT_CONTROL_STAND_UP);
 	}
 // [/RLVa:KB]
 }
 
+
 void LLAgent::handleServerBakeRegionTransition(const LLUUID& region_id)
 {
 	llinfos << "called" << llendl;
 
+
+	// Old-style appearance entering a server-bake region.
 	if (isAgentAvatarValid() &&
 		!gAgentAvatarp->isUsingServerBakes() &&
 		(mRegionp->getCentralBakeVersion()>0))
@@ -979,7 +983,6 @@ const LLHost& LLAgent::getRegionHost() const
 	}
 }
 
-
 //-----------------------------------------------------------------------------
 // inPrelude()
 //-----------------------------------------------------------------------------
@@ -1156,7 +1159,7 @@ void LLAgent::sitDown()
 //	setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 // [RLVa:KB] - Checked: 2010-08-28 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
 	// RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking
-	if ( (!rlv_handler_t::isEnabled()) || ((gRlvHandler.canStand()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
+	if ( (!rlv_handler_t::isEnabled()) || ((RlvActions::canStand()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
 	{
 		setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 	}
@@ -4338,7 +4341,7 @@ void LLAgent::teleportViaLocationLookAt(const LLVector3d& pos_global)
 // [RLVa:KB] - Checked: 2010-10-07 (RLVa-1.2.1f) | Added: RLVa-1.2.1f
 	// RELEASE-RLVa: [SL-2.2.0] Make sure this isn't used for anything except double-click teleporting
 	if ( (rlv_handler_t::isEnabled()) && (!RlvUtil::isForceTp()) && 
-		 ((gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) || (!gRlvHandler.canStand())) )
+		 ((gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) || (!RlvActions::canStand())) )
 	{
 		RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_TELEPORT);
 		return;

From 1b32c79a5ee837fdfe3c46afcc95d81c23a28e00 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 04:38:05 -0500
Subject: [PATCH 14/25] [RLVa] Miscellaneous other touches to rlva code

---
 indra/newview/rlvhelper.cpp    | 61 +++++++++++++---------------------
 indra/newview/rlvhelper.h      |  7 ++--
 indra/newview/rlvinventory.cpp | 16 +++++++++
 indra/newview/rlvinventory.h   | 13 +++++++-
 indra/newview/rlvlocks.cpp     |  3 +-
 5 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index e99f7290b..fbd06caec 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -263,11 +263,11 @@ RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd, getpa
 	RlvCommandOptionGeneric rlvCmdOption(rlvCmd.getOption());
 	if (rlvCmdOption.isWearableType())			// <option> can be a clothing layer
 	{
-		getItemIDs(rlvCmdOption.getWearableType(), m_idItems, false);
+		getItemIDs(rlvCmdOption.getWearableType(), m_idItems);
 	}
 	else if (rlvCmdOption.isAttachmentPoint())	// ... or it can specify an attachment point
 	{
- 		getItemIDs(rlvCmdOption.getAttachmentPoint(), m_idItems, false);
+		getItemIDs(rlvCmdOption.getAttachmentPoint(), m_idItems);
 	}
 	else if (rlvCmdOption.isEmpty())			// ... or it can be empty (in which case we act on the object that issued the command)
 	{
@@ -296,53 +296,40 @@ RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd, getpa
 	}
 }
 
-// Checked: 2010-11-30 (RLVa-1.3.0b) | Modified: RLVa-1.3.0b
-bool RlvCommandOptionGetPath::getItemIDs(const LLViewerJointAttachment* pAttachPt, uuid_vec_t& idItems, bool fClear)
+// Checked: 2013-10-12 (RLVa-1.4.9)
+bool RlvCommandOptionGetPath::getItemIDs(const LLViewerJointAttachment* pAttachPt, uuid_vec_t& idItems)
 {
-	if (fClear)
-		idItems.clear();
 	uuid_vec_t::size_type cntItemsPrev = idItems.size();
-	if (pAttachPt)
+
+	LLInventoryModel::cat_array_t folders; LLInventoryModel::item_array_t items;
+	RlvFindAttachmentsOnPoint f(pAttachPt);
+	gInventory.collectDescendentsIf(LLAppearanceMgr::instance().getCOF(), folders, items, false, f);
+	for (LLInventoryModel::item_array_t::const_iterator itItem = items.begin(); itItem != items.end(); ++itItem)
 	{
-		for (LLViewerJointAttachment::attachedobjs_vec_t::const_iterator itAttachObj = pAttachPt->mAttachedObjects.begin();
-				itAttachObj != pAttachPt->mAttachedObjects.end(); ++itAttachObj)
-		{
-			idItems.push_back((*itAttachObj)->getAttachmentItemID());
-		}
+		const LLViewerInventoryItem* pItem = *itItem;
+		if (pItem)
+			idItems.push_back(pItem->getLinkedUUID());
 	}
+
 	return (cntItemsPrev != idItems.size());
 }
 
-// Checked: 2010-11-30 (RLVa-1.3.0b) | Modified: RLVa-1.3.0b
-bool RlvCommandOptionGetPath::getItemIDs(LLWearableType::EType wtType, uuid_vec_t& idItems, bool fClear)
+// Checked: 2013-10-12 (RLVa-1.4.9)
+bool RlvCommandOptionGetPath::getItemIDs(LLWearableType::EType wtType, uuid_vec_t& idItems)
 {
-	if (fClear)
-		idItems.clear();
 	uuid_vec_t::size_type cntItemsPrev = idItems.size();
-	for (S32 idxWearable = 0, cntWearable = gAgentWearables.getWearableCount(wtType); idxWearable < cntWearable; idxWearable++)
-	{
-		idItems.push_back(gAgentWearables.getWearableItemID(wtType, idxWearable));
-	}
-	return (cntItemsPrev != idItems.size());
-}
 
-// Checked: 2011-03-28 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
-RlvCommandOptionAdjustHeight::RlvCommandOptionAdjustHeight(const RlvCommand& rlvCmd)
-	: m_nPelvisToFoot(0.0f), m_nPelvisToFootDeltaMult(0.0f), m_nPelvisToFootOffset(0.0f)
-{
-	std::vector<std::string> cmdTokens;
-	boost::split(cmdTokens, rlvCmd.getOption(), boost::is_any_of(std::string(";")));
-	if (1 == cmdTokens.size())
+	LLInventoryModel::cat_array_t folders; LLInventoryModel::item_array_t items;
+	LLFindWearablesOfType f(wtType);
+	gInventory.collectDescendentsIf(LLAppearanceMgr::instance().getCOF(), folders, items, false, f);
+	for (LLInventoryModel::item_array_t::const_iterator itItem = items.begin(); itItem != items.end(); ++itItem)
 	{
-		m_fValid = (LLStringUtil::convertToF32(cmdTokens[0], m_nPelvisToFootOffset));
-		m_nPelvisToFootOffset = llclamp<F32>(m_nPelvisToFootOffset / 100, -1.0f, 1.0f);
-	}
-	else if ( (2 <= cmdTokens.size()) && (cmdTokens.size() <= 3) )
-	{
-		m_fValid = (LLStringUtil::convertToF32(cmdTokens[0], m_nPelvisToFoot)) &&
-			 (LLStringUtil::convertToF32(cmdTokens[1], m_nPelvisToFootDeltaMult)) && 
-			 ( (2 == cmdTokens.size()) || (LLStringUtil::convertToF32(cmdTokens[2], m_nPelvisToFootOffset)) );
+		const LLViewerInventoryItem* pItem = *itItem;
+		if (pItem)
+			idItems.push_back(pItem->getLinkedUUID());
 	}
+
+	return (cntItemsPrev != idItems.size());
 }
 
 // Checked: 2011-03-28 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index e7de1aed4..6ce5afced 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -127,7 +127,7 @@ struct RlvCommandOptionGeneric : public RlvCommandOption
 		{ return (isString()) ? boost::get<std::string>(m_varOption) : LLStringUtil::null; }
 	const LLUUID&              getUUID() const
 		{ return (isUUID()) ? boost::get<LLUUID>(m_varOption) : LLUUID::null; }
-	LLWearableType::EType              getWearableType() const
+	LLWearableType::EType      getWearableType() const
 		{ return (isWearableType()) ? boost::get<LLWearableType::EType>(m_varOption) : LLWearableType::WT_INVALID; }
 
 protected:
@@ -144,8 +144,9 @@ struct RlvCommandOptionGetPath : public RlvCommandOption
 	/*virtual*/ bool  isEmpty() const	 { return m_idItems.empty(); }
 	const uuid_vec_t& getItemIDs() const { return m_idItems; }
 
-	static bool getItemIDs(const LLViewerJointAttachment* pAttachPt, uuid_vec_t& idItems, bool fClear = true);
-	static bool getItemIDs(LLWearableType::EType wtType, uuid_vec_t& idItems, bool fClear = true);
+	// NOTE: Both functions are COF-based rather than items gathered from mAttachedObjects or gAgentWearables
+	static bool getItemIDs(const LLViewerJointAttachment* pAttachPt, uuid_vec_t& idItems);
+	static bool getItemIDs(LLWearableType::EType wtType, uuid_vec_t& idItems);
 
 protected:
 	bool       m_fCallback; // TRUE if a callback is schedueled
diff --git a/indra/newview/rlvinventory.cpp b/indra/newview/rlvinventory.cpp
index be1113c4e..381eba618 100644
--- a/indra/newview/rlvinventory.cpp
+++ b/indra/newview/rlvinventory.cpp
@@ -787,3 +787,19 @@ bool RlvWearableItemCollector::operator()(LLInventoryCategory* pFolder, LLInvent
 }
 
 // ============================================================================
+// General purpose inventory helper classes
+//
+
+// Checked: 2013-10-12 (RLVa-1.4.9)
+bool RlvFindAttachmentsOnPoint::operator()(LLInventoryCategory* pFolder, LLInventoryItem* pItem)
+{
+#ifndef RLV_DEPRECATE_ATTACHPTNAMING
+	// First check if the item is attached to the attachment point; fall back to the item name otherwise
+	return (pItem) && (LLAssetType::AT_OBJECT == pItem->getType()) &&
+		( ((m_pAttachPt) && (m_pAttachPt->getAttachedObject(pItem->getLinkedUUID()))) || (RlvAttachPtLookup::getAttachPoint(pItem) == m_pAttachPt) );
+#else
+	return (pItem) && (LLAssetType::AT_OBJECT == pItem->getType()) && (m_pAttachPt) && (m_pAttachPt->getAttachedObject(pItem->getLinkedUUID()));
+#endif // RLV_DEPRECATE_LEGACY_ATTACHPT
+}
+
+// ============================================================================
diff --git a/indra/newview/rlvinventory.h b/indra/newview/rlvinventory.h
index 6c33ba92d..614663688 100644
--- a/indra/newview/rlvinventory.h
+++ b/indra/newview/rlvinventory.h
@@ -234,10 +234,21 @@ class RlvIsLinkType : public LLInventoryCollectFunctor
 {
 public:
 	RlvIsLinkType() {}
-	virtual ~RlvIsLinkType() {}
+	/*virtual*/ ~RlvIsLinkType() {}
 	virtual bool operator()(LLInventoryCategory* pFolder, LLInventoryItem* pItem) { return (pItem) && (pItem->getIsLinkType()); }
 };
 
+// If the attachment item is linked in COF but isn't worn (or just detached) the function will return inconsistent information
+class RlvFindAttachmentsOnPoint : public LLInventoryCollectFunctor
+{
+public:
+	RlvFindAttachmentsOnPoint(const LLViewerJointAttachment* pAttachPt) : m_pAttachPt(pAttachPt) {}
+	/*virtual*/ ~RlvFindAttachmentsOnPoint() {}
+	virtual bool operator()(LLInventoryCategory* pFolder, LLInventoryItem* pItem);
+protected:
+	const LLViewerJointAttachment* m_pAttachPt;
+};
+
 // ============================================================================
 // RlvInventory inlined member functions
 //
diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp
index cc675ee6e..8bf68b76a 100644
--- a/indra/newview/rlvlocks.cpp
+++ b/indra/newview/rlvlocks.cpp
@@ -250,6 +250,7 @@ bool RlvAttachmentLocks::canAttach() const
 	}
 	return false;
 }
+
 // Checked: 2010-08-07 (RLVa-1.2.0i) | Modified: RLVa-1.2.0i
 bool RlvAttachmentLocks::canDetach(const LLViewerJointAttachment* pAttachPt, bool fDetachAll /*=false*/) const
 {
@@ -1143,7 +1144,7 @@ bool RlvFolderLocks::getLockedFolders(const folderlock_source_t& lockSource, LLI
 		case ST_WEARABLETYPE:
 			{
 				RLV_ASSERT( ((ST_ATTACHMENTPOINT == lockSource.first) && (typeid(S32) == lockSource.second.type())) || 
-					((ST_WEARABLETYPE == lockSource.first) && (typeid(LLWearableType::EType) == lockSource.second.type())) );
+					        ((ST_WEARABLETYPE == lockSource.first) && (typeid(LLWearableType::EType) == lockSource.second.type())) );
 
 				uuid_vec_t idItems;
 				if (ST_ATTACHMENTPOINT == lockSource.first)

From 0c33c0de2e9fd2c597facea740a718b30fa20f46 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Tue, 28 Jan 2014 04:41:16 -0500
Subject: [PATCH 15/25] [RLVa] rlva_strings update.

rlva strings floater coming soon!

I highly doubt the translations work anymore
If they still can be translated, I leave it up to translators to decide if they should be
Contact me if you need translation code improved here.
---
 indra/newview/rlvcommon.cpp                   | 135 ++++++++---
 indra/newview/rlvcommon.h                     |  11 +-
 indra/newview/rlvdefines.h                    |   1 +
 .../skins/default/xui/en-us/rlva_strings.xml  | 212 ++++++++++++------
 4 files changed, 251 insertions(+), 108 deletions(-)

diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 9892c4e3c..e1184b4f4 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -157,44 +157,31 @@ bool RlvSettings::onChangedSettingBOOL(const LLSD& sdValue, bool* pfSetting)
 //
 
 std::vector<std::string> RlvStrings::m_Anonyms;
-std::map<std::string, std::string> RlvStrings::m_StringMap;
+RlvStrings::string_map_t RlvStrings::m_StringMap;
+std::string RlvStrings::m_StringMapPath;
 
-// Checked: 2010-03-09 (RLVa-1.2.0a) | Added: RLVa-1.1.0h
+// Checked: 2011-11-08 (RLVa-1.5.0)
 void RlvStrings::initClass()
 {
 	static bool fInitialized = false;
 	if (!fInitialized)
 	{
-		LLXMLNodePtr xmlRoot;
-		if ( (!LLUICtrlFactory::getLayeredXMLNode("rlva_strings.xml", xmlRoot)) || (xmlRoot.isNull()) || (!xmlRoot->hasName("rlva_strings")) )
+		// Load the default string values
+		std::string* itFile = &gDirUtilp->findSkinnedFilename(LLUICtrlFactory::getXUIPaths().front(), RLV_STRINGS_FILE);
+		/*
+		std::vector<std::string> files = gDirUtilp->findSkinnedFilenames(LLDir::XUI, RLV_STRINGS_FILE, LLDir::ALL_SKINS);
+		m_StringMapPath = (!files.empty()) ? files.front() : LLStringUtil::null;
+		for (auto itFile = files.cbegin(); itFile != files.cend(); ++itFile)
+		*/
+		if (!itFile->empty())
 		{
-			RLV_ERRS << "Problem reading RLVa string XML file" << RLV_ENDL;
-			return;
+			loadFromFile(*itFile, false);
 		}
 
-		for (LLXMLNode* pNode = xmlRoot->getFirstChild(); pNode != NULL; pNode = pNode->getNextSibling())
-		{
-			if (pNode->hasName("strings"))
-			{
-				std::string strName;
-				for (LLXMLNode* pStringNode = pNode->getFirstChild(); pStringNode != NULL; pStringNode = pStringNode->getNextSibling())
-				{
-					if ( (!pStringNode->hasName("string")) || (!pStringNode->getAttributeString("name", strName)) )
-						continue;
-					m_StringMap[strName] = pStringNode->getTextContents();
-				}
-			}
-			else if (pNode->hasName("anonyms"))
-			{
-				for (LLXMLNode* pAnonymNode = pNode->getFirstChild(); pAnonymNode != NULL; pAnonymNode = pAnonymNode->getNextSibling())
-				{
-					if (!pAnonymNode->hasName("anonym"))
-						continue;
-					m_Anonyms.push_back(pAnonymNode->getTextContents());
-				}
-			}
-		}
+		// Load the custom string overrides
+		loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, RLV_STRINGS_FILE), true);
 
+		// Sanity check
 		if ( (m_StringMap.empty()) || (m_Anonyms.empty()) )
 		{
 			RLV_ERRS << "Problem parsing RLVa string XML file" << RLV_ENDL;
@@ -205,6 +192,68 @@ void RlvStrings::initClass()
 	}
 }
 
+// Checked: 2011-11-08 (RLVa-1.5.0)
+void RlvStrings::loadFromFile(const std::string& strFilePath, bool fUserOverride)
+{
+	llifstream fileStream(strFilePath, std::ios::binary); LLSD sdFileData;
+	if ( (!fileStream.is_open()) || (!LLSDSerialize::fromXMLDocument(sdFileData, fileStream)) )
+		return;
+	fileStream.close();
+
+	if (sdFileData.has("strings"))
+	{
+		const LLSD& sdStrings = sdFileData["strings"];
+		for (LLSD::map_const_iterator itString = sdStrings.beginMap(); itString != sdStrings.endMap(); ++itString)
+		{
+			if ( (!itString->second.has("value")) || ((fUserOverride) && (!hasString(itString->first))) )
+				continue;
+
+			std::list<std::string>& listValues = m_StringMap[itString->first];
+			if (!fUserOverride)
+			{
+				if (listValues.size() > 0)
+					listValues.pop_front();
+				listValues.push_front(itString->second["value"].asString());
+			}
+			else
+			{
+				while (listValues.size() > 1)
+					listValues.pop_back();
+				listValues.push_back(itString->second["value"].asString());
+			}
+		}
+	}
+	if (sdFileData.has("anonyms"))
+	{
+		const LLSD& sdAnonyms = sdFileData["anonyms"];
+		for (LLSD::array_const_iterator itAnonym = sdAnonyms.beginArray(); itAnonym != sdAnonyms.endArray(); ++itAnonym)
+		{
+			m_Anonyms.push_back((*itAnonym).asString());
+		}
+	}
+}
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+void RlvStrings::saveToFile(const std::string& strFilePath)
+{
+	LLSD sdFileData;
+
+	LLSD& sdStrings = sdFileData["strings"];
+	for (string_map_t::const_iterator itString = m_StringMap.begin(); itString != m_StringMap.end(); ++itString)
+	{
+		const std::list<std::string>& listValues = itString->second;
+		if (listValues.size() > 1)
+			sdStrings[itString->first]["value"] = listValues.back();
+	}
+
+	llofstream fileStream(strFilePath);
+	if (!fileStream.good())
+		return;
+
+	LLSDSerialize::toPrettyXML(sdFileData, fileStream);
+	fileStream.close();
+}
+
 // Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
 const std::string& RlvStrings::getAnonym(const std::string& strName)
 {
@@ -217,12 +266,12 @@ const std::string& RlvStrings::getAnonym(const std::string& strName)
 	return m_Anonyms[nHash % m_Anonyms.size()];
 }
 
-// Checked: 2009-11-11 (RLVa-1.1.0a) | Added: RLVa-1.1.0a
+// Checked: 2011-11-08 (RLVa-1.5.0)
 const std::string& RlvStrings::getString(const std::string& strStringName)
 {
 	static const std::string strMissing = "(Missing RLVa string)";
-	std::map<std::string, std::string>::const_iterator itString = m_StringMap.find(strStringName);
-	return (itString != m_StringMap.end()) ? itString->second : strMissing;
+	string_map_t::const_iterator itString = m_StringMap.find(strStringName);
+	return (itString != m_StringMap.end()) ? itString->second.back() : strMissing;
 }
 
 // Checked: 2009-11-25 (RLVa-1.1.0f) | Added: RLVa-1.1.0f
@@ -251,6 +300,8 @@ const char* RlvStrings::getStringFromReturnCode(ERlvCmdRet eRet)
 			return "unknown command";
 		case RLV_RET_FAILED_NOSHAREDROOT:
 			return "missing #RLV";
+		case RLV_RET_DEPRECATED:
+			return "deprecated";
 		// The following are identified by the chat verb
 		case RLV_RET_RETAINED:
 		case RLV_RET_SUCCESS:
@@ -283,15 +334,29 @@ std::string RlvStrings::getVersionAbout()
 }
 
 // Checked: 2010-03-27 (RLVa-1.4.0a) | Modified: RLVa-1.1.0a
-std::string RlvStrings::getVersionNum() 
+std::string RlvStrings::getVersionNum()
 {
 	return llformat("%d%02d%02d%02d", RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH, RLV_VERSION_BUILD);
 }
 
-// Checked: 2010-05-26 (RLVa-1.2.0h) | Added: RLVa-1.2.0g
-bool RlvStrings::hasString(const std::string& strStringName)
+// Checked: 2011-11-08 (RLVa-1.5.0)
+bool RlvStrings::hasString(const std::string& strStringName, bool fCheckCustom)
 {
-	return m_StringMap.find(strStringName) != m_StringMap.end();
+	string_map_t::const_iterator itString = m_StringMap.find(strStringName);
+	return (itString != m_StringMap.end()) && ((!fCheckCustom) || (itString->second.size() > 0));
+}
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+void RlvStrings::setCustomString(const std::string& strStringName, const std::string& strStringValue)
+{
+	if (!hasString(strStringName))
+		return;
+
+	std::list<std::string>& listValues = m_StringMap[strStringName];
+	while (listValues.size() > 1)
+		listValues.pop_back();
+	if (!strStringValue.empty())
+		listValues.push_back(strStringValue);
 }
 
 // ============================================================================
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index 4170263d3..2af64c274 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -128,20 +128,25 @@ class RlvStrings
 {
 public:
 	static void initClass();
+	static void loadFromFile(const std::string& strFilePath, bool fDefault);
+	static void saveToFile(const std::string& strFilePath);
 
 	static const std::string& getAnonym(const LLAvatarName& avName);		// @shownames
 	static const std::string& getAnonym(const std::string& strName);		// @shownames
-	static const std::string& getBehaviourNotificationString(ERlvBehaviour eBhvr, ERlvParamType eType);
 	static const std::string& getString(const std::string& strStringName);
 	static const char*        getStringFromReturnCode(ERlvCmdRet eRet);
+	static const std::string& getStringMapPath() { return m_StringMapPath; }
 	static std::string        getVersion(bool fLegacy = false);				// @version
 	static std::string        getVersionAbout();							// Shown in Help / About
 	static std::string        getVersionNum();								// @versionnum
-	static bool               hasString(const std::string& strStringName);
+	static bool               hasString(const std::string& strStringName, bool fCheckCustom = false);
+	static void               setCustomString(const std::string& strStringName, const std::string& strStringValue);
 
 protected:
 	static std::vector<std::string> m_Anonyms;
-	static std::map<std::string, std::string> m_StringMap;
+	typedef std::map<std::string, std::list<std::string> > string_map_t;
+	static string_map_t m_StringMap;
+	static std::string  m_StringMapPath;
 };
 
 // ============================================================================
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 8057b121b..a97ea3e16 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -102,6 +102,7 @@ const S32 RLVa_VERSION_BUILD = 0;
 #define RLV_CMD_PREFIX					'@'
 #define RLV_PUTINV_PREFIX				"#RLV/~"
 #define RLV_SETROT_OFFSET				F_PI_BY_TWO		// @setrot is off by 90° with the rest of SL
+#define RLV_STRINGS_FILE				"rlva_strings.xml"
 
 #define RLV_FOLDER_FLAG_NOSTRIP			"nostrip"
 #define RLV_FOLDER_PREFIX_HIDDEN		'.'
diff --git a/indra/newview/skins/default/xui/en-us/rlva_strings.xml b/indra/newview/skins/default/xui/en-us/rlva_strings.xml
index 73ddc6710..0e3c27ca0 100644
--- a/indra/newview/skins/default/xui/en-us/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/en-us/rlva_strings.xml
@@ -1,77 +1,149 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<rlva_strings>
+<llsd>
+<map>
 
-  <strings>
-    <!-- Primarily used when @showloc restricted -->
-    <string name="hidden_generic">(Hidden)</string>
-    <string name="hidden_parcel">(Hidden parcel)</string>
-    <string name="hidden_region">(Hidden region)</string>
+	<key>strings</key>
+	<map>
+		<!-- Primarily used when @showloc restricted -->
+		<key>hidden_generic</key>
+		<map>
+			<key>value</key>
+			<string>(Hidden)</string>
+		</map>
+		<key>hidden_parcel</key>
+		<map>
+			<key>value</key>
+			<string>(Hidden parcel)</string>
+		</map>
+		<key>hidden_region</key>
+		<map>
+			<key>value</key>
+			<string>(Hidden region)</string>
+		</map>
 
-    <!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
-    <string name="blocked_recvim">*** IM blocked by your viewer</string>
-    <string name="blocked_sendim">*** IM blocked by sender's viewer</string>
+		<!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
+		<key>blocked_recvim</key>
+		<map>
+			<key>value</key>
+			<string>*** IM blocked by your viewer</string>
+			<key>description</key>
+			<string>Shown in place of the original message when an incoming IM is blocked</string>
+			<key>label</key>
+			<string>Blocked incoming IM message (local)</string>
+			<key>customizable</key>
+			<boolean>1</boolean>
+		</map>
+		<key>blocked_sendim</key>
+		<map>
+			<key>value</key>
+			<string>*** IM blocked by sender's viewer</string>
+			<key>description</key>
+			<string>Shown (and sent to the remote party) when an outgoing IM is blocked</string>
+			<key>label</key>
+			<string>Blocked outgoing IM message (local + remote)</string>
+			<key>customizable</key>
+			<boolean>1</boolean>
+		</map>
 
-    <!-- Shown as notifications -->
-    <string name="blocked_generic">Unable to perform action due to RLV restrictions</string>
-    <string name="blocked_permattach">Attempt to attach '[OBJECT]' was denied due to RLV restrictions</string>
-    <string name="blocked_startim">Unable to start IM session with [RECIPIENT] due to RLV restrictions</string>
-    <string name="blocked_startconf">Unable to start conference due to RLV restrictions</string>
-    <string name="blocked_teleport">Unable to initiate teleport due to RLV restrictions</string>
-    <string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
+		<!-- Shown as notifications -->
+		<key>blocked_generic</key>
+		<map>
+			<key>value</key>
+			<string>Unable to perform action due to RLV restrictions</string>
+		</map>
+		<key>blocked_permattach</key>
+		<map>
+			<key>value</key>
+			<string>Attempt to attach '[OBJECT]' was denied due to RLV restrictions</string>
+		</map>
+		<key>blocked_permteleport</key>
+		<map>
+			<key>value</key>
+			<string>[OBJECT]' was denied permission to teleport you due to RLV restrictions</string>
+		</map>
+		<key>blocked_startim</key>
+		<map>
+			<key>value</key>
+			<string>Unable to start IM session with [RECIPIENT] due to RLV restrictions</string>
+		</map>
+		<key>blocked_startconf</key>
+		<map>
+			<key>value</key>
+			<string>Unable to start conference with [RECIPIENT] due to RLV restrictions</string>
+		</map>
+		<key>blocked_teleport</key>
+		<map>
+			<key>value</key>
+			<string>Unable to initiate teleport due to RLV restrictions</string>
+		</map>
+		<key>blocked_viewxxx</key>
+		<map>
+			<key>value</key>
+			<string>Unable to open [TYPE] due to RLV restrictions</string>
+		</map>
+		<key>blocked_wireframe</key>
+		<map>
+			<key>value</key>
+			<string>Unable to enable wireframe mode due to RLV restrictions</string>
+		</map>
 
-    <!-- Sent as "Busy" messages to the remote party -->
-    <string name="blocked_recvim_remote">
-      The Resident you messaged is prevented from reading your instant messages at the moment, please try again later.
-    </string>
-    <string name="blocked_tplure_remote">
-      The Resident you invited is prevented from accepting teleport offers. Please try again later.
-    </string>
+		<!-- Sent as "Busy" messages to the remote party -->
+		<key>blocked_recvim_remote</key>
+		<map>
+			<key>value</key>
+			<string>The Resident you messaged is currently prevented from reading your instant messages at the moment, please try again later.</string>
+			<key>description</key>
+			<string>Sent to the remote party when their IM was blocked</string>
+			<key>label</key>
+			<string>Blocked incoming IM message (remote)</string>
+			<key>customizable</key>
+			<boolean>1</boolean>
+		</map>
+		<key>blocked_tplurerequest_remote</key>
+		<map>
+			<key>value</key>
+			<string>The Resident is currently prevented from accepting. Please try again later.</string>
+			<key>description</key>
+			<string>Sent to the remote party when their teleport offer or request was blocked</string>
+			<key>label</key>
+			<string>Blocked teleport offer/request (remote)</string>
+			<key>customizable</key>
+			<boolean>1</boolean>
+		</map>
+	</map>
 
-    <!-- Shown in local chat when dropping inventory onto a nearby agent (moved to strings.xml since it needs to be accesible by LLTrans) -->
-    <!--
-    <string name="inventory_item_offered_rlv">
-      Inventory item offered to [NAME]
-    </string>
-    -->
-  </strings>
+	<!-- Generic names used to replace resident names when @shownames restricted -->
+	<key>anonyms</key>
+	<array>
+		<string>A resident</string>
+		<string>This resident</string>
+		<string>That resident</string>
+		<string>An individual</string>
+		<string>This individual</string>
+		<string>That individual</string>
+		<string>A person</string>
+		<string>This person</string>
+		<string>That person</string>
+		<string>A stranger</string>
+		<string>This stranger</string>
+		<string>That stranger</string>
+		<string>A being</string>
+		<string>This being</string>
+		<string>That being</string>
+		<string>An agent</string>
+		<string>This agent</string>
+		<string>That agent</string>
+		<string>A soul</string>
+		<string>This soul</string>
+		<string>That soul</string>
+		<string>Somebody</string>
+		<string>Some people</string>
+		<string>Someone</string>
+		<string>Mysterious one</string>
+		<string>An unknown being</string>
+		<string>Unidentified one</string>
+		<string>An unknown person</string>
+	</array>
 
-  <!-- Generic names used to replace resident names when @shownames restricted -->
-  <anonyms>
-    <anonym>A resident</anonym>
-    <anonym>This resident</anonym>
-    <anonym>That resident</anonym>
-    <anonym>An individual</anonym>
-    <anonym>This individual</anonym>
-    <anonym>That individual</anonym>
-    <anonym>A person</anonym>
-    <anonym>This person</anonym>
-    <anonym>That person</anonym>
-    <anonym>A stranger</anonym>
-    <anonym>This stranger</anonym>
-    <anonym>That stranger</anonym>
-    <anonym>A being</anonym>
-    <anonym>This being</anonym>
-    <anonym>That being</anonym>
-    <anonym>An agent</anonym>
-    <anonym>This agent</anonym>
-    <anonym>That agent</anonym>
-    <anonym>A soul</anonym>
-    <anonym>This soul</anonym>
-    <anonym>That soul</anonym>
-    <anonym>Somebody</anonym>
-    <anonym>Some people</anonym>
-    <anonym>Someone</anonym>
-    <anonym>Mysterious one</anonym>
-    <anonym>An unknown being</anonym>
-    <anonym>Unidentified one</anonym>
-    <anonym>An unknown person</anonym>
-  </anonyms>
-
-  <behaviour-notifications>
-    <!-- 
-    <notification behaviour="defaultwear" type="add">Text goes here</notification>
-    <notification behaviour="defaultwear" type="rem">Text goes here</notification>
-    -->
-  </behaviour-notifications>
-
-</rlva_strings>
+</map>
+</llsd>

From bceaee6e4163be51e99cb9aff40ce7ab28f8b27b Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 31 Jan 2014 00:47:19 -0500
Subject: [PATCH 16/25] [RLVa] rlva strings floater!

Generalized toggle() visible() call pattern of rlv floaters to a template struct.
---
 indra/newview/llviewermenu.cpp                |   1 +
 indra/newview/rlvcommon.cpp                   |   9 +-
 indra/newview/rlvfloaters.cpp                 | 300 ++++++++++++++++++
 indra/newview/rlvfloaters.h                   |  51 ++-
 .../default/xui/en-us/floater_rlv_strings.xml |  52 +++
 .../skins/default/xui/en-us/notifications.xml |   8 +
 6 files changed, 408 insertions(+), 13 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en-us/floater_rlv_strings.xml

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c51535d7d..102738498 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1656,6 +1656,7 @@ void init_debug_rlva_menu(LLMenuGL* menu)
 
 	menu->addChild(new LLMenuItemCheckGL("Restrictions...", &RlvFloaterBehaviours::toggle, NULL, &RlvFloaterBehaviours::visible, NULL));
 	menu->addChild(new LLMenuItemCheckGL("Locks...", &RlvFloaterLocks::toggle, NULL, &RlvFloaterLocks::visible, NULL));
+	menu->addChild(new LLMenuItemCheckGL("Strings...", &RlvFloaterStrings::toggle, NULL, &RlvFloaterStrings::visible, NULL));
 }
 // [/RLVa:KB]
 
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index e1184b4f4..bd4326680 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -167,16 +167,17 @@ void RlvStrings::initClass()
 	if (!fInitialized)
 	{
 		// Load the default string values
-		std::string* itFile = &gDirUtilp->findSkinnedFilename(LLUICtrlFactory::getXUIPaths().front(), RLV_STRINGS_FILE);
-		/*
+		/* Singu TODO: findSkinnedFilenames/LLDir update
 		std::vector<std::string> files = gDirUtilp->findSkinnedFilenames(LLDir::XUI, RLV_STRINGS_FILE, LLDir::ALL_SKINS);
 		m_StringMapPath = (!files.empty()) ? files.front() : LLStringUtil::null;
 		for (auto itFile = files.cbegin(); itFile != files.cend(); ++itFile)
 		*/
-		if (!itFile->empty())
+		std::string itFile = gDirUtilp->findSkinnedFilename(LLUICtrlFactory::getXUIPaths().front(), RLV_STRINGS_FILE);
+		if (!itFile.empty())
 		{
-			loadFromFile(*itFile, false);
+			loadFromFile(itFile, false);
 		}
+		m_StringMapPath = itFile; // Singu TODO: Remove this when updating to the above LLDir impl.
 
 		// Load the custom string overrides
 		loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, RLV_STRINGS_FILE), true);
diff --git a/indra/newview/rlvfloaters.cpp b/indra/newview/rlvfloaters.cpp
index 68f3dc2c1..d409d08ba 100644
--- a/indra/newview/rlvfloaters.cpp
+++ b/indra/newview/rlvfloaters.cpp
@@ -15,9 +15,16 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+
+#include "llappearancemgr.h"
 #include "llavatarnamecache.h"
 #include "llclipboard.h"
+#include "llcombobox.h"
+#include "llinventoryfunctions.h"
+#include "llnotificationsutil.h"
 #include "llscrolllistctrl.h"
+#include "llsdserialize.h"
+#include "lltexteditor.h"
 #include "llviewerjointattachment.h"
 #include "llviewerobjectlist.h"
 #include "llvoavatarself.h"
@@ -32,6 +39,34 @@
 // Helper functions
 //
 
+// Checked: 2012-07-14 (RLVa-1.4.7)
+std::string rlvGetItemName(const LLViewerInventoryItem* pItem)
+{
+	if ( (pItem) && ((LLAssetType::AT_BODYPART == pItem->getType()) || (LLAssetType::AT_CLOTHING == pItem->getType())) )
+		return llformat("%s (%s)", pItem->getName().c_str(), LLWearableType::getTypeName(pItem->getWearableType()).c_str());
+	else if ( (pItem) && (LLAssetType::AT_OBJECT == pItem->getType()) && (isAgentAvatarValid()) )
+		return llformat("%s (%s)", pItem->getName().c_str(), gAgentAvatarp->getAttachedPointName(pItem->getUUID()).c_str());
+	return (pItem) ? pItem->getName() : LLStringUtil::null;
+}
+
+// Checked: 2012-07-14 (RLVa-1.4.7)
+std::string rlvGetItemType(const LLViewerInventoryItem* pItem)
+{
+	if (pItem)
+	{
+		switch (pItem->getType())
+		{
+			case LLAssetType::AT_BODYPART:
+			case LLAssetType::AT_CLOTHING:
+				return "Wearable";
+			case LLAssetType::AT_OBJECT:
+				return "Attachment";
+			default:
+				break;
+		}
+	}
+	return "Unknown";
+}
 
 // Checked: 2010-03-11 (RLVa-1.2.0a) | Modified: RLVa-1.2.0g
 std::string rlvGetItemNameFromObjID(const LLUUID& idObj, bool fIncludeAttachPt = true)
@@ -61,13 +96,97 @@ bool rlvGetShowException(ERlvBehaviour eBhvr)
 		case RLV_BHVR_RECVIM:
 		case RLV_BHVR_STARTIM:
 		case RLV_BHVR_TPLURE:
+		case RLV_BHVR_TPREQUEST:
 		case RLV_BHVR_ACCEPTTP:
+		case RLV_BHVR_ACCEPTTPREQUEST:
 			return true;
 		default:
 			return false;
 	}
 }
 
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvLockMaskToString(ERlvLockMask eLockType)
+{
+	switch (eLockType)
+	{
+		case RLV_LOCK_ADD:
+			return "add";
+		case RLV_LOCK_REMOVE:
+			return "rem";
+		default:
+			return "unknown";
+	}
+}
+
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvFolderLockPermissionToString(RlvFolderLocks::ELockPermission eLockPermission)
+{
+	switch (eLockPermission)
+	{
+		case RlvFolderLocks::PERM_ALLOW:
+			return "allow";
+		case RlvFolderLocks::PERM_DENY:
+			return "deny";
+		default:
+			return "unknown";
+	}
+}
+
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvFolderLockScopeToString(RlvFolderLocks::ELockScope eLockScope)
+{
+	switch (eLockScope)
+	{
+		case RlvFolderLocks::SCOPE_NODE:
+			return "node";
+		case RlvFolderLocks::SCOPE_SUBTREE:
+			return "subtree";
+		default:
+			return "unknown";
+	}
+}
+
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvFolderLockSourceToTarget(RlvFolderLocks::folderlock_source_t lockSource)
+{
+	switch (lockSource.first)
+	{
+		case RlvFolderLocks::ST_ATTACHMENT:
+			{
+				std::string strAttachName = rlvGetItemNameFromObjID(boost::get<LLUUID>(lockSource.second));
+				return llformat("Attachment (%s)", strAttachName.c_str());
+			}
+		case RlvFolderLocks::ST_ATTACHMENTPOINT:
+			{
+				const LLViewerJointAttachment* pAttachPt = RlvAttachPtLookup::getAttachPoint(boost::get<S32>(lockSource.second));
+				return llformat("Attachment point (%s)", (pAttachPt) ? pAttachPt->getName().c_str() : "Unknown");
+			}
+		case RlvFolderLocks::ST_FOLDER:
+			{
+				return "Folder: <todo>";
+			}
+		case RlvFolderLocks::ST_ROOTFOLDER:
+			{
+				return "Root folder";
+			}
+		case RlvFolderLocks::ST_SHAREDPATH:
+			{
+				const std::string& strPath = boost::get<std::string>(lockSource.second);
+				return llformat("Shared path (#RLV%s%s)", (!strPath.empty()) ? "/" : "", strPath.c_str());
+			}
+		case RlvFolderLocks::ST_WEARABLETYPE:
+			{
+				const std::string& strTypeName = LLWearableType::getTypeName(boost::get<LLWearableType::EType>(lockSource.second));
+				return llformat("Wearable type (%s)", strTypeName.c_str());
+			}
+		default:
+			{
+				return "(Unknown)";
+			}
+	}
+}
+
 // ============================================================================
 // RlvFloaterBehaviours member functions
 //
@@ -381,6 +500,187 @@ void RlvFloaterLocks::refreshAll()
 
 		pLockList->addElement(sdRow, ADD_BOTTOM);
 	}
+
+	//
+	// List "nostrip" (soft) locks
+	//
+	sdColumns[1]["value"] = "nostrip";
+	sdColumns[3]["value"] = "(Agent)";
+
+	LLInventoryModel::cat_array_t folders; LLInventoryModel::item_array_t items;
+	LLFindWearablesEx f(true, true);
+	gInventory.collectDescendentsIf(LLAppearanceMgr::instance().getCOF(), folders, items, FALSE, f);
+
+	for (LLInventoryModel::item_array_t::const_iterator itItem = items.begin(); itItem != items.end(); ++itItem)
+	{
+		const LLViewerInventoryItem* pItem = *itItem;
+		if (!RlvForceWear::instance().isStrippable(pItem->getUUID()))
+		{
+			sdColumns[0]["value"] = rlvGetItemType(pItem);
+			sdColumns[2]["value"] = rlvGetItemName(pItem);
+
+			pLockList->addElement(sdRow, ADD_BOTTOM);
+		}
+	}
+
+	//
+	// List folder locks
+	//
+	{
+		// Folder lock descriptors
+		const RlvFolderLocks::folderlock_list_t& folderLocks = RlvFolderLocks::instance().getFolderLocks();
+		for (RlvFolderLocks::folderlock_list_t::const_iterator itFolderLock = folderLocks.begin(); 
+				itFolderLock != folderLocks.end(); ++itFolderLock)
+		{
+			const RlvFolderLocks::folderlock_descr_t* pLockDescr = *itFolderLock;
+			if (pLockDescr)
+			{
+				sdColumns[0]["value"] = "Folder Descriptor";
+				sdColumns[1]["value"] =
+					rlvLockMaskToString(pLockDescr->eLockType) + "/" +
+					rlvFolderLockPermissionToString(pLockDescr->eLockPermission) + "/" +
+					rlvFolderLockScopeToString(pLockDescr->eLockScope);
+				sdColumns[2]["value"] = rlvFolderLockSourceToTarget(pLockDescr->lockSource);
+				sdColumns[3]["value"] = rlvGetItemNameFromObjID(pLockDescr->idRlvObj);
+
+				pLockList->addElement(sdRow, ADD_BOTTOM);
+			}
+		}
+	}
+
+	{
+		// Folder locked attachments and wearables
+		uuid_vec_t idItems;
+		const uuid_vec_t& folderLockAttachmentsIds = RlvFolderLocks::instance().getAttachmentLookups();
+		idItems.insert(idItems.end(), folderLockAttachmentsIds.begin(), folderLockAttachmentsIds.end());
+		const uuid_vec_t& folderLockWearabels = RlvFolderLocks::instance().getWearableLookups();
+		idItems.insert(idItems.end(), folderLockWearabels.begin(), folderLockWearabels.end());
+
+		for (uuid_vec_t::const_iterator itItemId = idItems.begin(); itItemId != idItems.end(); ++itItemId)
+		{
+			const LLViewerInventoryItem* pItem = gInventory.getItem(*itItemId);
+			if (pItem)
+			{
+				sdColumns[0]["value"] = rlvGetItemType(pItem);
+				sdColumns[1]["value"] = rlvLockMaskToString(RLV_LOCK_REMOVE);
+				sdColumns[2]["value"] = rlvGetItemName(pItem);
+				sdColumns[3]["value"] = "<Folder Lock>";
+
+				pLockList->addElement(sdRow, ADD_BOTTOM);
+			}
+		}
+	}
+}
+
+// ============================================================================
+// RlvFloaterStrings member functions
+//
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+RlvFloaterStrings::RlvFloaterStrings(const LLSD& sdKey)
+	: LLFloater(sdKey)
+	, m_fDirty(false)
+	, m_pStringList(NULL)
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_rlv_strings.xml");
+}
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+BOOL RlvFloaterStrings::postBuild()
+{
+	// Set up the UI controls
+	m_pStringList = findChild<LLComboBox>("string_list");
+	m_pStringList->setCommitCallback(boost::bind(&RlvFloaterStrings::checkDirty, this, true));
+
+	LLUICtrl* pDefaultBtn = findChild<LLUICtrl>("default_btn");
+	pDefaultBtn->setCommitCallback(boost::bind(&RlvFloaterStrings::onStringRevertDefault, this));
+
+	// Read all string metadata from the default strings file
+	llifstream fileStream(RlvStrings::getStringMapPath(), std::ios::binary); LLSD sdFileData;
+	if ( (fileStream.is_open()) && (LLSDSerialize::fromXMLDocument(sdFileData, fileStream)) )
+	{
+		m_sdStringsInfo = sdFileData["strings"];
+		fileStream.close();
+	}
+
+	// Populate the combo box
+	for (LLSD::map_const_iterator itString = m_sdStringsInfo.beginMap(); itString != m_sdStringsInfo.endMap(); ++itString)
+	{
+		const LLSD& sdStringInfo = itString->second;
+		if ( (!sdStringInfo.has("customizable")) || (!sdStringInfo["customizable"].asBoolean()) )
+			continue;
+		m_pStringList->add( (sdStringInfo.has("label")) ? sdStringInfo["label"].asString() : itString->first, itString->first);
+	}
+
+	refresh();
+
+	return TRUE;
+}
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+void RlvFloaterStrings::onClose(bool fQuitting)
+{
+	checkDirty(false);
+	if (m_fDirty)
+	{
+		// Save the custom string overrides
+		RlvStrings::saveToFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, RLV_STRINGS_FILE));
+
+		if (!fQuitting) // Singu Note: We're done if fQuitting, don't notify
+		// Remind the user their changes require a relog to take effect
+		LLNotificationsUtil::add("RLVChangeStrings");
+	}
+
+	if (fQuitting) destroy();
+	else setVisible(false); // Hide when closing.
+}
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+void RlvFloaterStrings::onStringRevertDefault()
+{
+	if (!m_strStringCurrent.empty())
+	{
+		RlvStrings::setCustomString(m_strStringCurrent, LLStringUtil::null);
+		m_fDirty = true;
+	}
+	refresh();
+}
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+void RlvFloaterStrings::checkDirty(bool fRefresh)
+{
+	LLTextEditor* pStringValue = findChild<LLTextEditor>("string_value");
+	if (!pStringValue->isPristine())
+	{
+		RlvStrings::setCustomString(m_strStringCurrent, pStringValue->getText());
+		m_fDirty = true;
+	}
+
+	if (fRefresh)
+	{
+		refresh();
+	}
+}
+
+// Checked: 2011-11-08 (RLVa-1.5.0)
+void RlvFloaterStrings::refresh()
+{
+	m_strStringCurrent = (-1 != m_pStringList->getCurrentIndex()) ? m_pStringList->getSelectedValue().asString() : LLStringUtil::null;
+
+	LLTextEditor* pStringDescr = findChild<LLTextEditor>("string_descr");
+	pStringDescr->clear();
+	LLTextEditor* pStringValue = findChild<LLTextEditor>("string_value");
+	pStringValue->setEnabled(!m_strStringCurrent.empty());
+	pStringValue->clear();
+	if (!m_strStringCurrent.empty())
+	{
+		if (m_sdStringsInfo[m_strStringCurrent].has("description"))
+			pStringDescr->setText(m_sdStringsInfo[m_strStringCurrent]["description"].asString());
+		pStringValue->setText(RlvStrings::getString(m_strStringCurrent));
+		pStringValue->makePristine();
+	}
+
+	findChild<LLUICtrl>("default_btn")->setEnabled(!m_strStringCurrent.empty());
 }
 
 // ============================================================================
diff --git a/indra/newview/rlvfloaters.h b/indra/newview/rlvfloaters.h
index 33b8ed9fa..daeac993b 100644
--- a/indra/newview/rlvfloaters.h
+++ b/indra/newview/rlvfloaters.h
@@ -22,11 +22,19 @@
 #include "rlvdefines.h"
 #include "rlvcommon.h"
 
+template<typename T>
+struct VisibleToggle
+{
+	static void toggle(void*) { return T::toggleInstance(); }
+	static BOOL visible(void*) { return T::instanceVisible(); }
+};
+
 // ============================================================================
 // RlvFloaterLocks class declaration
 //
 
-class RlvFloaterBehaviours : public LLFloater, public LLFloaterSingleton<RlvFloaterBehaviours>
+class RlvFloaterBehaviours : public LLFloater
+, public LLFloaterSingleton<RlvFloaterBehaviours>, public VisibleToggle<RlvFloaterBehaviours>
 {
 	friend class LLUISingleton<RlvFloaterBehaviours, VisibilityPolicy<LLFloater> >;
 private:
@@ -40,9 +48,6 @@ public:
 	/*virtual*/ void onClose(bool fQuitting);
 	/*virtual*/ BOOL postBuild();
 
-	static void toggle(void*) { return toggleInstance(); }
-	static BOOL visible(void*) { return instanceVisible(); }
-
 	/*
 	 * Member functions
 	 */
@@ -64,7 +69,8 @@ protected:
 // RlvFloaterLocks class declaration
 //
 
-class RlvFloaterLocks : public LLFloater, public LLFloaterSingleton<RlvFloaterLocks>
+class RlvFloaterLocks : public LLFloater
+, public LLFloaterSingleton<RlvFloaterLocks>, public VisibleToggle<RlvFloaterLocks>
 {
 	friend class LLUISingleton<RlvFloaterLocks, VisibilityPolicy<LLFloater> >;
 private:
@@ -78,9 +84,6 @@ public:
 	/*virtual*/ void onClose(bool fQuitting);
 	/*virtual*/ BOOL postBuild();
 
-	static void toggle(void*) { return toggleInstance(); }
-	static BOOL visible(void*) { return instanceVisible(); }
-
 	/*
 	 * Member functions
 	 */
@@ -96,5 +99,35 @@ protected:
 };
 
 // ============================================================================
+// RlvFloaterStrings class declaration
+//
 
-#endif // RLV_FLOATERS_H
\ No newline at end of file
+class RlvFloaterStrings : public LLFloater
+, public LLFloaterSingleton<RlvFloaterStrings>, public VisibleToggle<RlvFloaterStrings>
+{
+	friend class LLUISingleton<RlvFloaterStrings, VisibilityPolicy<LLFloater> >;
+private:
+	RlvFloaterStrings(const LLSD& sdKey);
+
+	// LLFloater overrides
+public:
+	/*virtual*/ void onClose(bool fQuitting);
+	/*virtual*/ BOOL postBuild();
+
+	// Member functions
+protected:
+	void onStringRevertDefault();
+	void checkDirty(bool fRefresh);
+	void refresh();
+
+	// Member variables
+protected:
+	bool		m_fDirty;
+	std::string m_strStringCurrent;
+	LLComboBox*	m_pStringList;
+	LLSD		m_sdStringsInfo;
+};
+
+// ============================================================================
+
+#endif // RLV_FLOATERS_H
diff --git a/indra/newview/skins/default/xui/en-us/floater_rlv_strings.xml b/indra/newview/skins/default/xui/en-us/floater_rlv_strings.xml
new file mode 100644
index 000000000..f3ea7a010
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/floater_rlv_strings.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ height="215"
+ layout="topleft"
+ legacy_header_height="18"
+ name="rlva_strings"
+ title="RLVa Strings"
+ width="350">
+    <combo_box
+     allow_text_entry="false"
+     follows="top|left"
+     height="22"
+     layout="topleft"
+     left="15"
+     max_chars="255"
+     name="string_list"
+     bottom="-45"
+     width="320" />
+    <text_editor
+     enabled="false"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     name="string_descr"
+     bottom_delta="-65"
+     width="320"
+     hide_scrollbar="true"
+     word_wrap="true" />
+    <text_editor
+     enabled="true"
+     height="60"
+     layout="topleft"
+     left_delta="0"
+     name="string_value"
+     bottom_delta="-65"
+     width="320"
+     hide_scrollbar="true"
+     word_wrap="true" />
+    <button
+     enabled="false"
+     height="22"
+     label="Reset to default"
+     layout="topleft"
+     left_delta="0"
+     name="default_btn"
+     bottom_delta="-27"
+     width="150" >
+      <button.commit_callback
+       function="ClickDefault" />
+    </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 307424ff0..eaf0d0fb7 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -9693,6 +9693,14 @@ Cannot create large prims that intersect other players.  Please re-try when othe
 
 
 <!-- Singularity Specific notifications should go below here, alphabetically -->
+<!-- Singu Note: RLVa notifications come first here -->
+  <notification
+   icon="alertmodal.tga"
+   name="RLVChangeStrings"
+   type="alertmodal">
+Changes won't take effect until after you restart [APP_NAME].
+  </notification>
+
 <!-- Singu TODO: Migrate our special notifications to here -->
   <notification
    icon="notifytip.tga"

From b03f7c1504ebf66c98c7edd2d5eeca5d8a025212 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 31 Jan 2014 00:50:45 -0500
Subject: [PATCH 17/25] [RLVa] Version 1.4.9

Thanks to Trinity and, of course, her Kitty!
---
 indra/newview/rlvdefines.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index a97ea3e16..72c504ff8 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -64,7 +64,7 @@ const S32 RLV_VERSION_BUILD = 0;
 // Implementation version
 const S32 RLVa_VERSION_MAJOR = 1;
 const S32 RLVa_VERSION_MINOR = 4;
-const S32 RLVa_VERSION_PATCH = 8;
+const S32 RLVa_VERSION_PATCH = 9;
 const S32 RLVa_VERSION_BUILD = 0;
 
 // Uncomment before a final release

From 151afe466370e38b6c8e471f77c40ff404f08805 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 31 Jan 2014 00:52:16 -0500
Subject: [PATCH 18/25] Translations fix ups

---
 .../skins/default/xui/de/notifications.xml    |  12 +-
 .../default/xui/en-us/floater_buy_land.xml    |   6 +-
 .../skins/default/xui/es/notifications.xml    |   2 +-
 .../default/xui/it/floater_about_land.xml     |   6 +-
 ....xml => floater_animation_bvh_preview.xml} |   0
 .../skins/default/xui/it/floater_bumps.xml    |  10 +-
 .../default/xui/it/floater_buy_contents.xml   |   2 +-
 .../default/xui/it/floater_buy_currency.xml   |  14 +-
 .../skins/default/xui/it/floater_buy_land.xml |  32 +--
 .../default/xui/it/floater_buy_object.xml     |   2 +-
 .../default/xui/it/floater_chat_history.xml   |  39 ---
 .../xui/it/floater_device_settings.xml        |   2 -
 .../default/xui/it/floater_directory.xml      |   8 +-
 .../default/xui/it/floater_group_info.xml     | 262 ------------------
 .../xui/it/floater_hardware_settings.xml      |  38 ---
 .../skins/default/xui/it/floater_im.xml       |  45 ---
 .../skins/default/xui/it/floater_import.xml   |  17 --
 .../it/floater_inventory_item_properties.xml  |   2 +-
 .../default/xui/it/floater_media_browser.xml  |  20 --
 .../skins/default/xui/it/floater_new_im.xml   |  11 -
 .../xui/it/floater_price_for_listing.xml      |   2 +-
 .../default/xui/it/floater_report_bug.xml     | 104 -------
 .../default/xui/it/floater_sell_land.xml      |   4 +-
 .../skins/default/xui/it/floater_snapshot.xml |   4 +-
 .../skins/default/xui/it/floater_tools.xml    |  10 +-
 .../default/xui/it/floater_voice_wizard.xml   |   9 -
 .../default/xui/it/floater_web_content.xml    |  11 +
 .../skins/default/xui/it/notifications.xml    |  62 ++---
 .../default/xui/it/panel_audio_device.xml     |  25 --
 .../xui/it/panel_avatar_classified.xml        |   2 +-
 .../skins/default/xui/it/panel_classified.xml |   2 +-
 .../default/xui/it/panel_group_finder.xml     |   9 -
 .../default/xui/it/panel_group_general.xml    |   8 +-
 .../default/xui/it/panel_group_land_money.xml |   4 +-
 .../skins/default/xui/it/panel_place.xml      |   2 +-
 .../default/xui/it/panel_place_small.xml      |   2 +-
 .../xui/it/panel_preferences_media.xml        |  24 --
 .../default/xui/it/panel_region_texture.xml   |  57 ----
 .../skins/default/xui/it/panel_top_pick.xml   |  10 -
 .../default/xui/it/panel_voice_enable.xml     |  23 --
 .../newview/skins/default/xui/it/strings.xml  |  46 ++-
 .../skins/default/xui/pt/floater_bumps.xml    |  10 +-
 .../default/xui/pt/floater_media_browser.xml  |  20 --
 .../default/xui/pt/floater_web_content.xml    |  12 +
 .../skins/default/xui/pt/notifications.xml    |  12 +-
 45 files changed, 176 insertions(+), 828 deletions(-)
 rename indra/newview/skins/default/xui/it/{floater_animation_preview.xml => floater_animation_bvh_preview.xml} (100%)
 delete mode 100644 indra/newview/skins/default/xui/it/floater_device_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_group_info.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_hardware_settings.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_im.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_import.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_media_browser.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_new_im.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_report_bug.xml
 delete mode 100644 indra/newview/skins/default/xui/it/floater_voice_wizard.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_web_content.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_audio_device.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_group_finder.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_preferences_media.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_region_texture.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_top_pick.xml
 delete mode 100644 indra/newview/skins/default/xui/it/panel_voice_enable.xml
 delete mode 100644 indra/newview/skins/default/xui/pt/floater_media_browser.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_web_content.xml

diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index fd604c161..37a86b525 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -145,12 +145,12 @@ W&#xE4;hlen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.</notificat
   <notification name="SaveClothingBodyChanges">&#xC4;nderung an Kleidung/K&#xF6;rperteilen speichern?<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" yestext="Alles speichern"/></notification>
 
   <notification name="GrantModifyRights">Die Gew&#xE4;hrung von &#xC4;nderungsrechten an andere Einwohner erm&#xF6;glicht es diesen, JEDES BELIEBIGE Objekt zu &#xE4;ndern oder an sich zu nehmen, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen dieser Erlaubnis.
-M&#xF6;chten Sie [FIRST_NAME] [LAST_NAME] &#xC4;nderungsrechte gew&#xE4;hren?<usetemplate name="okcancelbuttons" yestext="Ja"/></notification>
+M&#xF6;chten Sie [NAME] &#xC4;nderungsrechte gew&#xE4;hren?<usetemplate name="okcancelbuttons" yestext="Ja"/></notification>
 
   <notification name="GrantModifyRightsMultiple">Die Gew&#xE4;hrung von &#xC4;nderungsrechten an andere Einwohner erm&#xF6;glicht es diesen, JEDES BELIEBIGE Objekt zu &#xE4;ndern, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen dieser Erlaubnis.
 M&#xF6;chten Sie den ausgew&#xE4;hlten Einwohnern &#xC4;nderungsrechte gew&#xE4;hren?<usetemplate name="okcancelbuttons" yestext="Ja"/></notification>
 
-  <notification name="RevokeModifyRights">M&#xF6;chten Sie [FIRST_NAME] [LAST_NAME] die &#xC4;nderungsrechte entziehen?<usetemplate name="okcancelbuttons" yestext="Ja"/></notification>
+  <notification name="RevokeModifyRights">M&#xF6;chten Sie [NAME] die &#xC4;nderungsrechte entziehen?<usetemplate name="okcancelbuttons" yestext="Ja"/></notification>
 
   <notification name="RevokeModifyRightsMultiple">M&#xF6;chten Sie den ausgew&#xE4;hlten Einwohnern die &#xC4;nderungsrechte entziehen?<usetemplate name="okcancelbuttons" yestext="Ja"/></notification>
 
@@ -816,7 +816,7 @@ Sie sind nicht berechtigt, Land f&#xFC;r die aktive Gruppe zu kaufen.</notificat
       <button name="Cancel" text="Abbrechen"/>
     </form></notification>
 
-  <notification name="RemoveFromFriends">M&#xF6;chten Sie [FIRST_NAME] [LAST_NAME] aus Ihrer Freundesliste entfernen?<usetemplate name="okcancelbuttons" yestext="OK"/></notification>
+  <notification name="RemoveFromFriends">M&#xF6;chten Sie [NAME] aus Ihrer Freundesliste entfernen?<usetemplate name="okcancelbuttons" yestext="OK"/></notification>
 
   <notification name="RemoveMultipleFromFriends">M&#xF6;chten Sie mehrere Freunde aus Ihrer Freundesliste entfernen?<usetemplate name="okcancelbuttons" yestext="OK"/></notification>
 
@@ -902,7 +902,7 @@ Der Gruppe &#x201E;[GROUP_NAME]&#x201C;
  [AREA] m&#xB2; Land schenken?<usetemplate name="okcancelbuttons" yestext="OK"/></notification>
 
   <notification name="DeedLandToGroupWithContribution">Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe &#xFC;ber ausreichende Landnutzungsrechte verf&#xFC;gt.
-Die Schenkung beinhaltet eine Land&#xFC;bertragung an die Gruppe von &#x201E;[FIRST_NAME] [LAST_NAME]&#x201C;.
+Die Schenkung beinhaltet eine Land&#xFC;bertragung an die Gruppe von &#x201E;[NAME]&#x201C;.
 Dem Eigent&#xFC;mer wird der Kaufpreis f&#xFC;r das Land nicht r&#xFC;ckerstattet. Bei Verkauf der &#xFC;bertragenen Parzelle wird der Erl&#xF6;s zwischen den Gruppenmitgliedern aufgeteilt.
 
 Der Gruppe &#x201E;[GROUP_NAME]&#x201C;
@@ -951,9 +951,9 @@ Sie k&#xF6;nnen sich sp&#xE4;ter noch umentscheiden.<usetemplate name="okcancelb
 
   <notification name="NotEnoughCurrency">[NAME] [PRICE] L$  Sie haben nicht gen&#xFC;gend L$, um diese Aktion auszuf&#xFC;hren.</notification>
 
-  <notification name="GrantedModifyRights">Sie verf&#xFC;gen &#xFC;ber &#xC4;nderungsrechte f&#xFC;r die Objekte von [FIRST_NAME] [LAST_NAME].</notification>
+  <notification name="GrantedModifyRights">Sie verf&#xFC;gen &#xFC;ber &#xC4;nderungsrechte f&#xFC;r die Objekte von [NAME].</notification>
 
-  <notification name="RevokedModifyRights">Ihnen wurden die &#xC4;nderungsrechte f&#xFC;r die Objekte von [FIRST_NAME] [LAST_NAME] entzogen.</notification>
+  <notification name="RevokedModifyRights">Ihnen wurden die &#xC4;nderungsrechte f&#xFC;r die Objekte von [NAME] entzogen.</notification>
 
   <notification name="FlushMapVisibilityCaches">Der Kartencache dieser Region wird geleert.
 Diese Aktion ist nur beim Debugging sinnvoll.
diff --git a/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index 598f21d82..b5a538e5e 100644
--- a/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -169,7 +169,7 @@ This parcel is 512 sq.m. of land.
 	<pad height="0" width="8" />
 	<text bottom_delta="3" follows="top|right" height="16" left="260" name="currency_est"
 	     width="178">
-		for approx. US$ [AMOUNT2]
+		for approx. [REALCURRENCY] [AMOUNT2]
 	</text>
 	<text follows="top|left" height="16" left="72" name="currency_balance" right="400">
 		You have L$ 2,100.
@@ -261,7 +261,7 @@ Try selecting a smaller area.
 		Pay [CURRENCY] [AMOUNT] to [SELLER] for this land
 	</string>
 	<string name="buy_for_US">
-		Buy [CURRENCY] [AMOUNT] for approx. US$ [AMOUNT2],
+		Buy [CURRENCY] [AMOUNT] for approx. [REALCURRENCY] [AMOUNT2],
 	</string>
 	<string name="parcel_meters">
 		This parcel is [AMOUNT] sq.m.
@@ -306,6 +306,6 @@ supports [AMOUNT2] objects
 		(no parcel selected)
 	</string>
 	<string name="buy_currency">
-		Buy [CURRENCY] [LINDENS] for approx. US$ [USD]
+		Buy [CURRENCY] [LINDENS] for approx. [REALCURRENCY] [USD]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 36bd2e17b..edbc87013 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -3404,7 +3404,7 @@ Por favor, vuelve a intentarlo.
 	</notification>
 	
 	<notification name="OfferedCard">
-		Has ofrecido una tarjeta de visita a [FIRST] [LAST]
+		Has ofrecido una tarjeta de visita a [NAME]
 	</notification>
 	
 	<notification name="UnableToBuyWhileDownloading">
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index 550304e5d..8366add8b 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -42,7 +42,7 @@
 				Non in vendita.
 			</text>
 			<text name="For Sale: Price L$[PRICE]." left="119">
-				Prezzo: [PRICE]L$ ([PRICE_PER_SQM]L$/m²).
+				Prezzo: [PRICE][CURRENCY] ([PRICE_PER_SQM][CURRENCY]/m²).
 			</text>
 			<text name="SalePending" left="119" width="321"/>
 			<button bottom="-242" label="Vendi la terra..." label_selected="Vendi la terra..." name="Sell Land..."/>
@@ -292,7 +292,7 @@ o suddivisa.
 			</text>
 			<check_box label="Sicuro (senza danno)" name="check safe" tool_tip="Se spuntato, imposta il terreno su &apos;sicuro&apos;, disabilitando i danni da combattimento. Se non spuntato, viene abilitato il combattimento a morte."/>
 			<check_box label="Nessuna spinta" name="PushRestrictCheck" tool_tip="Previeni i colpi. Selezionare questa opzione può essere utile per prevenire comportamenti dannosi sul tuo terreno."/>
-			<check_box label="Mostra il luogo nella ricerca (30 L$/week) sotto" name="ShowDirectoryCheck" tool_tip="Lascia che questa terra sia vista dagli altri nei risultati di ricerca"/>
+			<check_box label="Mostra il luogo nella ricerca (30 [CURRENCY]/week) sotto" name="ShowDirectoryCheck" tool_tip="Lascia che questa terra sia vista dagli altri nei risultati di ricerca"/>
 			<string name="search_enabled_tooltip">
 				Fai in modo che la gente trovi questo terreno nei risultati della ricerca.
 			</string>
@@ -506,7 +506,7 @@ Media:
 					Gruppo
 				</combo_item>
 			</combo_box>
-			<spinner label="Prezzo in L$:" name="PriceSpin"/>
+			<spinner label="Prezzo in [CURRENCY]:" name="PriceSpin"/>
 			<spinner label="Ore di accesso:" name="HoursSpin"/>
 			<text label="Permetti sempre" name="AllowedText">
 				Residenti permessi
diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
similarity index 100%
rename from indra/newview/skins/default/xui/it/floater_animation_preview.xml
rename to indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml
index d9ce29fa0..d3a2a4ce4 100644
--- a/indra/newview/skins/default/xui/it/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/it/floater_bumps.xml
@@ -4,18 +4,18 @@
 		Nessuno rilevato
 	</string>
 	<string name="bump">
-		[TIME]  [FIRST] [LAST] ti ha urtato
+		[TIME]  [NAME] ti ha urtato
 	</string>
 	<string name="llpushobject">
-		[TIME]  [FIRST] [LAST] ti ha spinto per mezzo di uno script
+		[TIME]  [NAME] ti ha spinto per mezzo di uno script
 	</string>
 	<string name="selected_object_collide">
-		[TIME]  [FIRST] [LAST] ti ha colpito con un oggetto
+		[TIME]  [NAME] ti ha colpito con un oggetto
 	</string>
 	<string name="scripted_object_collide">
-		[TIME]  [FIRST] [LAST] ti ha colpito con un oggetto scriptato
+		[TIME]  [NAME] ti ha colpito con un oggetto scriptato
 	</string>
 	<string name="physical_object_collide">
-		[TIME]  [FIRST] [LAST] ti ha colpito con un oggetto fisico
+		[TIME]  [NAME] ti ha colpito con un oggetto fisico
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
index 2836f9897..7915d7a33 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
@@ -4,7 +4,7 @@
 		[NAME] contiene:
 	</text>
 	<text name="buy_text">
-		Compra per [AMOUNT]L$ da [NAME]?
+		Compra per [AMOUNT][CURRENCY] da [NAME]?
 	</text>
 	<button label="Annulla" label_selected="Annulla" name="cancel_btn" width="73"/>
 	<button label="Compra" label_selected="Compra" name="buy_btn" width="73" left_delta="-77"/>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index a24f0dbe7..67912e478 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -17,10 +17,10 @@
 		Sto contattando il LindeX...
 	</text>
 	<text name="buy_action_unknown">
-		Compra L$ sul mercato delle valute LindeX
+		Compra [CURRENCY] sul mercato delle valute LindeX
 	</text>
 	<text name="buy_action">
-		[NAME] [PRICE]L$
+		[NAME] [PRICE][CURRENCY]
 	</text>
 	<text name="currency_action" width="45">
 		Compra 
@@ -29,7 +29,7 @@
 		1234
 	</line_editor>
 	<text name="currency_est">
-		L$  per circa [USD]US$
+		per circa [USD]US$
 	</text>
 	<text name="getting_data">
 		Dati in ricezione...
@@ -38,19 +38,19 @@
 		Attualmente possiedi
 	</text>
 	<text name="balance_amount">
-		[AMT]L$
+		[AMT][CURRENCY]
 	</text>
 	<text name="buying_label">
 		Stai comprando
 	</text>
 	<text name="buying_amount">
-		[AMT]L$
+		[AMT][CURRENCY]
 	</text>
 	<text name="total_label">
 		Il tuo saldo sarà
 	</text>
 	<text name="total_amount">
-		[AMT]L$
+		[AMT][CURRENCY]
 	</text>
 	<text name="purchase_warning_repurchase" height="48" bottom_delta="-64" right="-10">
 		Confermando questa operazione si acquisterà solo
@@ -64,6 +64,6 @@ Devi aumentare l&apos;importo da acquistare.
 	<button label="Cancella" name="cancel_btn"/>
 	<button label="Acquista" name="buy_btn"/>
 	<string name="buy_currency">
-		acquistare [LINDENS] L$ per circa [USD] US$
+		acquistare [LINDENS] [CURRENCY] per circa [USD] US$
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
index 38919aa1e..d3486d9d5 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml
@@ -57,8 +57,8 @@
 		Prezzo:
 	</text>
 	<text name="info_price">
-		1500 L$
-(1.1 L$/m²)
+		1500 [CURRENCY]
+(1.1 [CURRENCY]/m²)
 venduta con gli oggetti
 	</text>
 	<text name="info_action">
@@ -92,22 +92,22 @@ venduta con gli oggetti
 		Possiedi 1309 m² di terra. Questa porzione è 512 m² di terra.
 	</text>
 	<text name="purchase_action">
-		Paga il residente Joe 4000 L$ per la terra
+		Paga il residente Joe 4000 [CURRENCY] per la terra
 	</text>
 	<text name="currency_reason">
-		Possiedi 2.100 L$.
+		Possiedi 2.100 [CURRENCY].
 	</text>
 	<text name="currency_action" width="106">
-		Compra ulteriori L$
+		Compra ulteriori [CURRENCY]
 	</text>
 	<line_editor name="currency_amt" left="174" width="80">
 		1000
 	</line_editor>
 	<text name="currency_est">
-		per circa [AMOUNT2] US$
+		per circa [AMOUNT2] [REALCURRENCY]
 	</text>
 	<text name="currency_balance">
-		Possiedi 2.100 L$.
+		Possiedi 2.100 [CURRENCY].
 	</text>
 	<check_box label="Rimuovi [AMOUNT] metri quadri di contribuzione dal gruppo." name="remove_contribution"/>
 	<button label="Compra" name="buy_btn"/>
@@ -189,10 +189,10 @@ Prova a selezionare un&apos;area più piccola.
 		Possiedi [BUYER] di metri quadri di terra.
 	</string>
 	<string name="pay_to_for_land">
-		Paga [AMOUNT] L$ a [SELLER] per questa terra
+		Paga [AMOUNT] [CURRENCY] a [SELLER] per questa terra
 	</string>
 	<string name="buy_for_US">
-		Comprare [AMOUNT] L$ per circa [AMOUNT2] US$,
+		Comprare [AMOUNT] [CURRENCY] per circa [AMOUNT2] [REALCURRENCY],
 	</string>
 	<string name="parcel_meters">
 		Questo terreno è di [AMOUNT] metri quadri.
@@ -214,8 +214,8 @@ supporta [AMOUNT2] oggetti
 		Oggetti non inclusi
 	</string>
 	<string name="info_price_string">
-		[PRICE] L$ 
-([PRICE_PER_SQM] L$/m²)
+		[PRICE] [CURRENCY] 
+([PRICE_PER_SQM] [CURRENCY]/m²)
 [SOLD_WITH_OBJECTS]
 	</string>
 	<string name="insufficient_land_credits">
@@ -224,21 +224,21 @@ sufficienti a coprire l&apos;area del terreno prima che l&apos;acquisto
 sia completato.
 	</string>
 	<string name="have_enough_lindens">
-		Hai [AMOUNT] L$, che sono sufficienti per comprare questa terra.
+		Hai [AMOUNT] [CURRENCY], che sono sufficienti per comprare questa terra.
 	</string>
 	<string name="not_enough_lindens">
-		Hai solo [AMOUNT] L$, ed hai bisogno di altri [AMOUNT2] L$.
+		Hai solo [AMOUNT] [CURRENCY], ed hai bisogno di altri [AMOUNT2] [CURRENCY].
 	</string>
 	<string name="balance_left">
-		Dopo l&apos;acquisto, ti rimarranno [AMOUNT] L$.
+		Dopo l&apos;acquisto, ti rimarranno [AMOUNT] [CURRENCY].
 	</string>
 	<string name="balance_needed">
-		Hai bisogno di acquistare almeno [AMOUNT] L$ per comprare questo terreno.
+		Hai bisogno di acquistare almeno [AMOUNT] [CURRENCY] per comprare questo terreno.
 	</string>
 	<string name="no_parcel_selected">
 		(nessun terreno selezionato)
 	</string>
 	<string name="buy_currency">
-		Compra [LINDENS] L$ per appross. [USD] US$
+		Compra [LINDENS] [CURRENCY] per appross. [USD] [REALCURRENCY]
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml
index 90ff84a89..2816dcf05 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_object.xml
@@ -4,7 +4,7 @@
 		e dei suoi contenuti:
 	</text>
 	<text name="buy_text">
-		Compra per [AMOUNT]L$ da [NAME]?
+		Compra per [AMOUNT][CURRENCY] da [NAME]?
 	</text>
 	<button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
 	<button label="Compra" label_selected="Compra" name="buy_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_chat_history.xml b/indra/newview/skins/default/xui/it/floater_chat_history.xml
index 5d7a74d61..dc3630638 100644
--- a/indra/newview/skins/default/xui/it/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/it/floater_chat_history.xml
@@ -21,45 +21,6 @@
 	<string name="IM_end_log_string">
 		-- Fine della Registrazione Testo --
 	</string>
-  <string name="ScriptQuestionCautionChatGranted">
-	A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato concesso il permesso di: [PERMISSIONS].
-  </string>
-  <string name="ScriptQuestionCautionChatDenied">
-	A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato negato il permesso di: [PERMISSIONS].
-  </string>
-  <string name="ScriptTakeMoney">
-	Prendere dollari Linden (L$) da te
-  </string>
-  <string name="ActOnControlInputs">
-	Agire sul tuo controllo degli input
-  </string>
-  <string name="RemapControlInputs">
-	Rimappare il tuo controllo degli input
-  </string>
-  <string name="AnimateYourAvatar">
-	Animare il tuo avatar
-  </string>
-  <string name="AttachToYourAvatar">
-	Far indossare al tuo avatar
-  </string>
-  <string name="ReleaseOwnership">
-	Rilasciare la propietà è far diventare pubblico.
-  </string>
-  <string name="LinkAndDelink">
-	Collegare e scollegare dagli altri oggetti
-  </string>
-  <string name="AddAndRemoveJoints">
-	Aggiungere e rimuovere le giunzioni insieme con gli altri oggetti
-  </string>
-  <string name="ChangePermissions">
-	Cambiare i permessi
-  </string>
-  <string name="TrackYourCamera">
-	Tracciare la fotocamera
-  </string>
-  <string name="ControlYourCamera">
-	Controllare la tua fotocamera
-  </string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<combo_box label="Gesture" name="Gesture">
diff --git a/indra/newview/skins/default/xui/it/floater_device_settings.xml b/indra/newview/skins/default/xui/it/floater_device_settings.xml
deleted file mode 100644
index cbf965bf9..000000000
--- a/indra/newview/skins/default/xui/it/floater_device_settings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_device_settings" title="Impostazioni dispositivi Voice Chat"/>
diff --git a/indra/newview/skins/default/xui/it/floater_directory.xml b/indra/newview/skins/default/xui/it/floater_directory.xml
index b1d09c00c..da0180197 100644
--- a/indra/newview/skins/default/xui/it/floater_directory.xml
+++ b/indra/newview/skins/default/xui/it/floater_directory.xml
@@ -216,7 +216,7 @@
 				Nessun risultato.
 			</string>
 			<string name="land_help_text">
-				La terra può essere acquistata direttamente con Dollari Linden  (L$) oppure all&apos;asta sia in L$ o US$.
+				La terra può essere acquistata direttamente con Dollari Linden  ([CURRENCY]) oppure all&apos;asta sia in [CURRENCY] o [REALCURRENCY].
 Per acquistare direttamente, visita la terra e clicca sul nome del terreno nella barra del titolo.
 			</string>
 			<text name="find">
@@ -241,7 +241,7 @@ Per acquistare direttamente, visita la terra e clicca sul nome del terreno nella
 			</combo_box>
 			<check_box label="Prezzo &#8804; " name="pricecheck"/>
 			<text left="186" name="pricecheck_symbol">
-				L$
+				[CURRENCY]
 			</text>
 			<check_box label="Area &#8805; " name="areacheck" width="90"/>
 			<text left="186" name="areacheck_symbol">
@@ -253,9 +253,9 @@ Per acquistare direttamente, visita la terra e clicca sul nome del terreno nella
 			<scroll_list name="results">
 				<column label="Nome" name="name"/>
 				<column label="Tipo" name="landtype"/>
-				<column label="Prezzo L$" name="price"/>
+				<column label="Prezzo [CURRENCY]" name="price"/>
 				<column label="Area" name="area"/>
-				<column label="L$/m²" name="per_meter"/>
+				<column label="[CURRENCY]/m²" name="per_meter"/>
 			</scroll_list>
 			<button label="Succ &gt;" label_selected="Succ &gt;" name="Next &gt;"/>
 			<button label="&lt; Prec" label_selected="&lt; Prec" name="&lt; Prev"/>
diff --git a/indra/newview/skins/default/xui/it/floater_group_info.xml b/indra/newview/skins/default/xui/it/floater_group_info.xml
deleted file mode 100644
index 29df393f3..000000000
--- a/indra/newview/skins/default/xui/it/floater_group_info.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="groupinfo" title="I Linden - Informazioni sul gruppo">
-	<tab_container name="tab">
-		<panel label="Generale" name="gen">
-			<text name="title_box">
-				Informazioni sul gruppo
-			</text>
-			<text name="txt">
-				I gruppi sono un modo divertente per collaborare con i tuoi amici.
-			</text>
-			<text name="txt2">
-				I gruppi permettono di avere titoli, loghi e votazioni.
-			</text>
-			<text name="txt3">
-				Chiunque può creare un gruppo. Ogni persona può appartenere a un massimo di 25 gruppi.
-			</text>
-			<text name="txt4">
-				I gruppi devono avere almeno 3 membri per rimanere attivi
-			</text>
-			<text name="group_create_text">
-				Creare un gruppo costa 100L$
-			</text>
-			<text name="lbl">
-				Nome:
-			</text>
-			<text name="founder_label">
-				Fondatore:
-			</text>
-			<text name="lbl2">
-				Statuto del gruppo:
-			</text>
-			<check_box label="Mostra nell&apos;elenco dei gruppi" name="sho"/>
-			<check_box label="Mostra i membri del gruppo" name="sho_mem"/>
-			<check_box label="Pubblica sul web." name="allow_publish" tool_tip="Pubblica le informazioni del tuo profilo sul web."/>
-			<button label="?" label_selected="?" name="publish_help_btn"/>
-			<check_box name="mature" />
-		</panel>
-		<panel label="Titoli" name="tit">
-			<text name="txt">
-				Titoli del gruppo
-			</text>
-			<text name="txt2">
-				I gruppi hanno funzionari e membri, che possono avere titoli speciali.
-			</text>
-			<text name="txt3">
-				Questi titoli appaiono prima del loro nome inworld, in chat, e in IM
-			</text>
-			<text name="lbl">
-				Titolo del funzionario:
-			</text>
-			<text name="lbl2">
-				Titolo del membro:
-			</text>
-			<text name="lbl3">
-				Trascina una texture dal tuo inventario per impostare il logo del gruppo.
-			</text>
-			<texture_picker name="insig" tool_tip="Fai click per scegliere una foto"/>
-		</panel>
-		<panel label="Membri" name="mem">
-			<text name="txt">
-				Membri del gruppo
-			</text>
-			<text name="txt2">
-				Attuali Funzionari e membri del gruppo.
-			</text>
-			<text name="txt3">
-				Fai clic su un nome per visualizzare il profilo del membro.
-			</text>
-			<text name="lbl">
-				Funzionari:
-			</text>
-			<text name="members_label">
-				Membri:
-			</text>
-			<button label="Espelli il membro" label_selected="Espelli il membro" name="eject_member_btn"/>
-		</panel>
-		<panel label="Votazione" name="voting">
-			<tab_container name="tab">
-				<panel label="Elezione" name="recall">
-					<text name="txt">
-						Elezioni nel gruppo
-					</text>
-					<text name="instructions">
-						Premi il tasto &quot;inzia elezioni&quot; per iniziare una nuova elezione.
-Le candidature comprenderanno tutti i membri del gruppo anche coloro che non sono ufficiali.
-					</text>
-					<text name="lbl">
-						I candidati:
-					</text>
-					<button label="Vota" label_selected="Vota" name="btn_vote"/>
-					<button label="Astieniti" label_selected="Astieniti" name="btn_abstain"/>
-					<button label="Inizia Elezione" label_selected="Inizia Elezione" name="btn_start_election"/>
-					<text name="lbl2">
-						Quorum:
-					</text>
-					<spinner name="quorum" tool_tip="# il numero totale dei membri votanti necessarie affinchè le elezioni risultino valide."/>
-					<text name="quorum_text">
-						su un totale di 111 membri del gruppo.
-					</text>
-					<text name="lbl3">
-						Maggioranza:
-					</text>
-					<radio_group name="majority" tool_tip="Maggioranza dei voti totali necessari per vincere.">
-						<radio_item name="radio">
-							Maggioranza semplice
-						</radio_item>
-						<radio_item name="radio2">
-							Maggioranza dei 2/3
-						</radio_item>
-						<radio_item name="radio3">
-							Unanimità
-						</radio_item>
-					</radio_group>
-					<text name="duration_lbl">
-						Durata:
-					</text>
-					<spinner name="duration" tool_tip="Durata in giorni della votazione."/>
-					<text name="duration_days">
-						Giorni
-					</text>
-					<text name="start_lbl">
-						L&apos;elezione inizia il:
-					</text>
-					<text name="end_lbl">
-						L&apos;elezione finisce il:
-					</text>
-				</panel>
-				<panel label="Proposta" name="panel_group_proposals">
-					<text name="txt">
-						Proposte di gruppo
-					</text>
-					<text name="instructions">
-						Non sono attive proposte.  Premi il pulsante crea proposta per
-creare una nuova proposta.
-					</text>
-					<text name="proposal_lbl">
-						Proposte:
-					</text>
-					<button label="Si" label_selected="Si" name="btn_yes"/>
-					<button label="No" label_selected="No" name="btn_no"/>
-					<button label="Astieniti" label_selected="Astieniti" name="btn_abstain"/>
-					<button label="Visualizza elenco" label_selected="Visualizza elenco" name="btn_view_list"/>
-					<button label="Vedi la proposta" label_selected="Vedi la proposta" name="btn_view_item"/>
-					<button label="Crea proposta" label_selected="Crea proposta" name="btn_proposal"/>
-					<button label="Inoltra" label_selected="Inoltra" name="btn_submit"/>
-					<text name="quorum_lbl">
-						Quorum:
-					</text>
-					<spinner name="quorum" tool_tip="Numero totale membri votanti necessari perchè le votazioni risultino valide."/>
-					<text name="quorum_text">
-						su un totale di 111 membri del gruppo.
-					</text>
-					<text name="majority_lbl">
-						Maggioranza:
-					</text>
-					<radio_group name="majority" tool_tip="Maggioranza del totale dei voti necessari per vincere.">
-						<radio_item name="radio">
-							Richiesta la maggioranza semplice
-						</radio_item>
-						<radio_item name="radio2">
-							2/3 della maggioranza
-						</radio_item>
-						<radio_item name="radio3">
-							Unanimità
-						</radio_item>
-					</radio_group>
-					<text name="duration_lbl">
-						Durata:
-					</text>
-					<spinner name="duration" tool_tip="Durata in giorni della votazione."/>
-					<text name="duration_text">
-						giorni
-					</text>
-					<text name="start_lbl">
-						La votazione inizia il:
-					</text>
-					<text name="end_lbl">
-						La votazione finisce il:
-					</text>
-				</panel>
-				<panel label="Storico" name="History">
-					<text name="txt">
-						Storico delle votazioni di gruppo
-					</text>
-					<text name="instructions">
-						È possibile visualizzare risultati passati delle votazioni di gruppo
-					</text>
-					<text name="instructions2">
-						premendo &apos;Vedi la Votazione&apos;.
-					</text>
-					<text name="history_list_lbl">
-						Voti precedenti:
-					</text>
-					<text name="vote_text_lbl">
-						Voti precedenti:
-					</text>
-					<button label="Visualizza lista delle votazioni" label_selected="Visualizza lista delle votazioni" name="btn_view_list"/>
-					<button label="Visualizza lo storico delle votazioni" label_selected="Visualizza lo storico delle votazioni" name="btn_view_item"/>
-				</panel>
-			</tab_container>
-		</panel>
-		<panel label="Invita" name="inv">
-			<text name="txt">
-				Inviti nel gruppo
-			</text>
-			<text name="txt2">
-				Gli inviti vengono inviati tramite messaggi istantanei.
-			</text>
-			<text name="txt3">
-				Fai clic sul pulsante Aggiungi per aggiungere utenti alla lista.
-			</text>
-			<text name="lbl">
-				Funzionari:
-			</text>
-			<button label="Aggiungi funzionario..." label_selected="Aggiungi funzionario..." name="add_officer_btn"/>
-			<button label="Rimuovi il nome selezionato" label_selected="Rimuovi il nome selezionato" name="remove_officer_btn"/>
-			<text name="lbl2">
-				Membri:
-			</text>
-			<button label="Aggiungi membro..." label_selected="Aggiungi membro..." name="add_member_btn"/>
-			<button label="Rimuovi i selezionati" label_selected="Rimuovi i selezionati" name="remove_member_btn"/>
-			<text name="lbl3">
-				Tassa d&apos;iscrizione:
-			</text>
-			<check_box label="Iscrizioni aperte (non è necessario l&apos;invito)" name="open"/>
-		</panel>
-		<panel label="Terreno" name="land">
-			<text name="txt">
-				Terra posseduta dal gruppo
-			</text>
-			<text name="lbl">
-				Totale dei Contributi del Terreno:
-			</text>
-			<button label="Mappa..." label_selected="Mappa..." name="map_btn"/>
-			<text name="lbl2">
-				Terreno Totale in uso:
-			</text>
-			<text name="lbl3">
-				Terra disponibile:
-			</text>
-			<button label="Imposta Contributo" label_selected="Imposta Contributo" name="set_contrib_btn"/>
-			<text name="warning_label">
-				ATTENZIONE: Il gruppo possiede troppa terra. C&apos;è bisogno che i membri del gruppo aumentino il contributo.
-			</text>
-		</panel>
-		<panel label="Denaro" name="mon">
-			<tab_container name="group money history tab">
-				<panel label="Pianificazione" name="money panel"/>
-				<panel label="Dettagli" name="money panel2">
-					<button label="&lt; precedente" label_selected="&lt; precedente" name="&lt; Earlier" tool_tip="Vai indietro"/>
-					<button label="Successivo &gt;" label_selected="Successivo &gt;" name="Later &gt;" tool_tip="Vai avanti"/>
-				</panel>
-				<panel label="Vendite" name="money panel3">
-					<button label="&lt; Precedente" label_selected="&lt; Precedente" name="&lt; Earlier" tool_tip="Vai indietro"/>
-					<button label="Successivo &gt;" label_selected="Successivo &gt;" name="Later &gt;" tool_tip="Vai avanti"/>
-				</panel>
-			</tab_container>
-		</panel>
-	</tab_container>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
deleted file mode 100644
index 28a53c45e..000000000
--- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="Impostazioni Hardware">
-	<text name="Filtering:">
-		Filtraggio:
-	</text>
-	<check_box label="Filtraggio Anisotropico (rallenta se attivato)" name="ani"/>
-	<text name="Antialiasing:">
-		Antialiasing:
-	</text>
-	<combo_box label="Antialiasing" name="fsaa" width="94">
-		<combo_item name="FSAADisabled">
-			Disattivato
-		</combo_item>
-		<combo_item name="2x">
-			2x
-		</combo_item>
-		<combo_item name="4x">
-			4x
-		</combo_item>
-		<combo_item name="8x">
-			8x
-		</combo_item>
-		<combo_item name="16x">
-			16x
-		</combo_item>
-	</combo_box>
-	<spinner label="Gamma:" name="gamma"/>
-	<text name="(brightness, lower is brighter)">
-		(Luminosità, più basso = più luminoso, 0=default)
-	</text>
-	<text name="Enable VBO:">
-		Attiva VBO:
-	</text>
-	<check_box label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance.  Ma, su un vecchio hardware, spesso l&apos;implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/>
-	<slider label="Memoria Texture  (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantità di memoria allocata per le texture. Impostata di default sulla memoria della scheda grafica. Ridurla può aumentare la performance, ma può anche rendere le texture sfocate."/>
-	<spinner label="Indice della distanza &#10;della nebbia:" name="fog"/>
-	<button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im.xml b/indra/newview/skins/default/xui/it/floater_im.xml
deleted file mode 100644
index 2a9862fe7..000000000
--- a/indra/newview/skins/default/xui/it/floater_im.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="im_floater" title="">
-	<string name="only_user_message">
-		Sei l&apos;unico utente di questa sessione.
-	</string>
-	<string name="offline_message">
-		[FIRST] [LAST] è offline.
-	</string>
-	<string name="invite_message">
-		Clicca il tasto [BUTTON NAME] per accettare/connetterti a questa voice chat.
-	</string>
-	<string name="muted_message">
-		Hai mutato questo residente. L&apos;invio di un messaggio lo riabiliterà automaticamente.
-	</string>
-	<string name="generic_request_error">
-		Errore durante la richiesta, riprova più tardi.
-	</string>
-	<string name="insufficient_perms_error">
-		Non hai sufficienti permessi.
-	</string>
-	<string name="session_does_not_exist_error">
-		Questa sessione non esiste più
-	</string>
-	<string name="no_ability_error">
-		Non hai questa abilitazione.
-	</string>
-	<string name="not_a_mod_error">
-		Non sei un moderatore.
-	</string>
-	<string name="muted_error">
-		Un moderatore di gruppo ti ha disabilitato dalla chat di testo.
-	</string>
-	<string name="add_session_event">
-		Impossibile aggiungere utenti alla chat con [RECIPIENT].
-	</string>
-	<string name="message_session_event">
-		Impossibile inviare il messaggio nella chat con [RECIPIENT].
-	</string>
-	<string name="removed_from_group">
-		Sei stato espulso dal gruppo.
-	</string>
-	<string name="close_on_no_ability">
-		Non hai più le abilitazioni per rimanere nella sessione chat.
-	</string>
-</multi_floater>
diff --git a/indra/newview/skins/default/xui/it/floater_import.xml b/indra/newview/skins/default/xui/it/floater_import.xml
deleted file mode 100644
index fc332ee8b..000000000
--- a/indra/newview/skins/default/xui/it/floater_import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Import" title="">
-	<text name="name_label">
-		Nome:
-	</text>
-	<text name="description_label">
-		Descrizione:
-	</text>
-	<text name="preview_label">
-		Files da caricare:
-	</text>
-	<button label="Annulla" name="cancel_btn"/>
-	<button label="Carica (10 L$)" name="ok_btn"/>
-	<text name="preview_label2">
-		Anteprima dell&apos;immagine:
-	</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
index 50e5fb83d..9a5b1bf86 100644
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
@@ -68,7 +68,7 @@
 		</radio_item>
 	</radio_group>
 	<text name="TextPrice">
-		Prezzo:  L$
+		Prezzo:  [CURRENCY]
 	</text>
 	<string name="unknown">
 		(sconosciuto)
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
deleted file mode 100644
index 4d3462b34..000000000
--- a/indra/newview/skins/default/xui/it/floater_media_browser.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="Browser multimediale">
-	<layout_stack name="stack1">
-		<layout_panel name="nav_controls">
-			<button label="Indietro" name="back" width="75"/>
-			<button label="Avanti" name="forward" left_delta="75"  width="70"/>
-			<button label="Ricarica" name="reload" left_delta="75"/>
-			<combo_box left_delta="75" name="address" width="510"/>
-			<button label="Vai" name="go" left_delta="515"/>
-		</layout_panel>
-		<layout_panel name="parcel_owner_controls">
-			<button label="Invia questo URL al terreno" name="assign"/>
-		</layout_panel>
-		<layout_panel name="external_controls">
-			<button label="Apri nel web browser" name="open_browser"/>
-			<check_box label="Apri sempre nel web browser" name="open_always"/>
-			<button label="Chiudi" name="close"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_new_im.xml b/indra/newview/skins/default/xui/it/floater_new_im.xml
deleted file mode 100644
index 5ba1144cb..000000000
--- a/indra/newview/skins/default/xui/it/floater_new_im.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Nuovo IM" name="New IM" title="Nuovo IM">
-	<button label="Inizia" label_selected="Inizia" name="start_btn"/>
-	<button label="Chiudi" label_selected="Chiudi" name="close_btn"/>
-	<string name="name_format">
-		[FIRST] [LAST]
-	</string>
-	<string name="online_descriptor">
-		(online)
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
index 830798ee8..5597c04e8 100644
--- a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
@@ -10,7 +10,7 @@ Gli annunci pagati maggiormente appariranno più in
 alto nell&apos;elenco, e nella ricerca.
 	</text>
 	<text name="price_text" width="146">
-		Prezzo per l&apos;annuncio (L$):
+		Prezzo per l&apos;annuncio ([CURRENCY]):
 	</text>
 	<line_editor left="166" name="price_edit" />
 	<button label="Annulla" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_report_bug.xml b/indra/newview/skins/default/xui/it/floater_report_bug.xml
deleted file mode 100644
index efaa626d7..000000000
--- a/indra/newview/skins/default/xui/it/floater_report_bug.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="bug_reporter" title="Segnala un bug">
-	<check_box label="Includi una fotografia dello schermo" name="screen_check"/>
-	<text name="reporter_title">
-		Segnalato da:
-	</text>
-	<text name="sim_title">
-		Regione:
-	</text>
-	<text name="pos_title">
-		Posizione:
-	</text>
-	<text name="select_object_label">
-		Clicca il pulsante e poi l&apos;oggetto:
-	</text>
-	<button label="" label_selected="" name="pick_btn" tool_tip="Selezionatore di oggetti - Identifica un oggetto quale argomento di questa denuncia"/>
-	<text name="object_name_label">
-		Nome:
-	</text>
-	<text name="object_name">
-		Consetetur Sadipscing
-	</text>
-	<text name="owner_name_label">
-		Proprietario:
-	</text>
-	<text name="owner_name">
-		Hendrerit Vulputate
-	</text>
-	<combo_box name="category_combo" tool_tip="Categoria -- seleziona la categoria che descrive meglio questa denuncia">
-		<combo_item name="Selectcategory">
-			Seleziona categoria
-		</combo_item>
-		<combo_item name="Building">
-			Costruzioni
-		</combo_item>
-		<combo_item name="Character">
-			Personaggio
-		</combo_item>
-		<combo_item name="Chat/IM">
-			Chat/IM
-		</combo_item>
-		<combo_item name="Documentation">
-			Documentazione
-		</combo_item>
-		<combo_item name="Exploit">
-			Exploit
-		</combo_item>
-		<combo_item name="Graphics">
-			Grafica
-		</combo_item>
-		<combo_item name="Inventory">
-			Inventario
-		</combo_item>
-		<combo_item name="Lag">
-			Lag
-		</combo_item>
-		<combo_item name="MissingContent">
-			Contenuto mancante
-		</combo_item>
-		<combo_item name="LindenDollars(L$)">
-			Linden Dollar (L$)
-		</combo_item>
-		<combo_item name="Permissions">
-			Permessi
-		</combo_item>
-		<combo_item name="Physics">
-			Fisica
-		</combo_item>
-		<combo_item name="Script">
-			Script
-		</combo_item>
-		<combo_item name="Sound">
-			Audio
-		</combo_item>
-		<combo_item name="Stipends">
-			Stipendi
-		</combo_item>
-		<combo_item name="Userinterface">
-			Interfaccia utente
-		</combo_item>
-		<combo_item name="Miscellaneous">
-			Varie
-		</combo_item>
-	</combo_box>
-	<text name="sum_title">
-		Riassunto:
-	</text>
-	<text name="dscr_title">
-		Dettagli: (fornisci più informazioni possibili)
-	</text>
-	<text_editor name="details_edit">
-		Passi per riprodurre il bug:
-
-Risultati osservati:
-
-Risultati attesi:
-	</text_editor>
-	<text name="bug_aviso">
-		Nota: I rapporti incompleti non saranno esaminati
-Se questo bug ti permette di fare qualcosa che in teoria non potresti fare, soprattutto se ha effetti sulle prestazioni o sulla sicurezza,  per favore seleziona la categoria &apos;Exploit&apos;. Grazie!
-	</text>
-	<button label="Annulla" label_selected="Annulla" name="cancel_btn"/>
-	<button label="Segnala Bug" label_selected="Segnala Bug" name="send_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml
index 3f47c0ef7..188d81a72 100644
--- a/indra/newview/skins/default/xui/it/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml
@@ -24,10 +24,10 @@ terreno:
 		Scegli un prezzo appropriato per questa terra.
 	</text>
 	<text name="price_ld">
-		L$
+		[CURRENCY]
 	</text>
 	<text name="price_per_m">
-		([PER_METER] L$ per metro quadro)
+		([PER_METER] [CURRENCY] per metro quadro)
 	</text>
 	<text name="sell_to_label">
 		Vendi la terra a:
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index 5999bad51..4ceddd731 100644
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -8,7 +8,7 @@
 			Invia via email
 		</radio_item>
 		<radio_item name="texture">
-			Salva nel tuo inventario ([AMOUNT] L$)
+			Salva nel tuo inventario ([UPLOADFEE])
 		</radio_item>
 		<radio_item name="local">
 			Salva sul tuo disco rigido
@@ -19,7 +19,7 @@
 	</text>
 	<button label="Aggiorna la fotografia" name="new_snapshot_btn"/>
 	<button label="Invia" name="send_btn"/>
-	<button label="Salva ([AMOUNT] L$)" name="upload_btn"/>
+	<button label="Salva ([UPLOADFEE])" name="upload_btn"/>
 	<flyout_button label="Salva" name="save_btn" tool_tip="Salva l&apos;immagine come file" >
 		<flyout_button_item name="save_item">
 			Salva
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index 8592b67d0..23ea63450 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -122,7 +122,7 @@
 			<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti che l&apos;oggetto sia visibile nella ricerca"/>
 			<check_box label="In vendita" name="checkbox for sale"/>
 			<text name="Cost">
-				Prezzo:  L$
+				Prezzo:  [CURRENCY]
 			</text>
 			<radio_group name="sale type">
 				<radio_item name="Original">
@@ -201,13 +201,13 @@
 				Devi selezionare l&apos;intero oggetto per impostare i permessi.
 			</string>
 			<string name="Cost Default">
-				Prezzo:         L$
+				Prezzo:         [CURRENCY]
 			</string>
 			<string name="Cost Total">
-				Prezzo totale:  L$
+				Prezzo totale:  [CURRENCY]
 			</string>
 			<string name="Cost Per Unit">
-				Prezzo per:     L$
+				Prezzo per:     [CURRENCY]
 			</string>
 			<string name="Cost Mixed">
 				Prezzo misto
@@ -562,7 +562,7 @@ le caratteristiche.
 			Informazioni sul terreno
 		</text>
 		<text name="label_area_price">
-			Prezzo: [PRICE] L$ per [AREA] m²
+			Prezzo: [PRICE] [CURRENCY] per [AREA] m²
 		</text>
 		<text name="label_area">
 			Area: [AREA] m²
diff --git a/indra/newview/skins/default/xui/it/floater_voice_wizard.xml b/indra/newview/skins/default/xui/it/floater_voice_wizard.xml
deleted file mode 100644
index c4862ece6..000000000
--- a/indra/newview/skins/default/xui/it/floater_voice_wizard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_wizard" title="Setup del Voice">
-	<panel name="content_panel">
-		<button label="Precedente" name="back_btn"/>
-		<button label="Seguente" name="next_btn"/>
-		<button label="Finito" name="ok_btn"/>
-		<button label="Annulla" name="cancel_btn"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml
new file mode 100644
index 000000000..773161832
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_web_content.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_web_content" title="Browser multimediale">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button tool_tip="Indietro" name="back"/>
+			<button tool_tip="Avanti" name="forward"/>
+			<button tool_tip="Ricarica" name="reload"/>
+			<button tool_tip="Apri nel web browser" name="popexternal"/>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 458a9a3cb..026ffca53 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -248,32 +248,32 @@ Quando visiti il tuo profilo, puoi specificare qualunque URL come tuo profilo we
 Altri residenti possono visitare la URL che hai impostato cliccando sul tuo profilo.
 	</notification>
 	<notification name="JoinGroupCanAfford">
-		Iscriversi a questo gruppo costa [COST]L$.
+		Iscriversi a questo gruppo costa [COST][CURRENCY].
 Vuoi proseguire?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Iscriviti"/>
 	</notification>
 	<notification name="JoinGroupCannotAfford">
-		Iscriversi a questo gruppo costa [COST]L$.
-Non hai abbastanza L$ per iscriverti a questo gruppo.
+		Iscriversi a questo gruppo costa [COST][CURRENCY].
+Non hai abbastanza [CURRENCY] per iscriverti a questo gruppo.
 	</notification>
 	<notification name="LandBuyPass">
-		Pagando [COST]L$ puoi entrare in questa terra (&apos;[PARCEL_NAME]&apos;) per [TIME] ore.  Compri un pass?
+		Pagando [COST][CURRENCY] puoi entrare in questa terra (&apos;[PARCEL_NAME]&apos;) per [TIME] ore.  Compri un pass?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="SalePriceRestriction">
-		Il prezzo di vendita deve essere superiore a 0L$ se vendi a tutti.
-Seleziona una vendita individuale per vendere a 0L$.
+		Il prezzo di vendita deve essere superiore a 0[CURRENCY] se vendi a tutti.
+Seleziona una vendita individuale per vendere a 0[CURRENCY].
 	</notification>
 	<notification name="ConfirmLandSaleChange">
 		Il terreno selezionato di [LAND_SIZE] m² sta per essere messo in vendita.
-Il tuo prezzo di vendità è [SALE_PRICE]L$ ed è autorizzato alla vendita a [NAME].
+Il tuo prezzo di vendità è [SALE_PRICE][CURRENCY] ed è autorizzato alla vendita a [NAME].
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmLandSaleToAnyoneChange">
 		ATTENZIONE: Cliccando &apos;vendi a tutti&apos; rende il tuo terrono disponibile all&apos;intera comunità di Second Life, anche non in questa regione.
 
 Il terreno selezionato di [LAND_SIZE] m² sta per essere messo in vendita.
-Il tuo prezzo di vendità è [SALE_PRICE]L$ ed è autorizzato alla vendita a [NAME].
+Il tuo prezzo di vendità è [SALE_PRICE][CURRENCY] ed è autorizzato alla vendita a [NAME].
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
@@ -862,7 +862,7 @@ Seleziona un terreno intero, oppure dividi prima il tuo terreno.
 	</notification>
 	<notification name="ReleaseLandWarning">
 		Stai per rilasciare [AREA] m² di terreno.
-Rilasciare questo appezzamento di terreno lo toglierà dalle tue proprietà, ma non ti verranno dati L$.
+Rilasciare questo appezzamento di terreno lo toglierà dalle tue proprietà, ma non ti verranno dati [CURRENCY].
 
 Rilasciare questo terreno?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -1014,7 +1014,7 @@ su TUTTI I TERRENI di questa sim?
 		Devi specificare un nome per il tuo annuncio.
 	</notification>
 	<notification name="MinClassifiedPrice">
-		Il prezzo da pagare per essere messo in lista deve essere almeno [MIN_PRICE]L$.
+		Il prezzo da pagare per essere messo in lista deve essere almeno [MIN_PRICE][CURRENCY].
 
 Introduci un prezzo più alto.
 	</notification>
@@ -1102,7 +1102,7 @@ Cedi questo terreno di [AREA] m² al gruppo &apos;[GROUP_NAME]&apos;?
 	</notification>
 	<notification name="DeedLandToGroupWithContribution">
 		Cedendo questo terreno al gruppo sara richiesto hai componenti di avere e di mantenere il terreno con un credito sufficiente.
-La cessione include un contributo simultaneo di terreno al gruppo da &apos;[FIRST_NAME] [LAST_NAME]&apos;.
+La cessione include un contributo simultaneo di terreno al gruppo da &apos;[NAME]&apos;.
 Il prezzo di acquisto del terreno non è rifondibile al proprietario.
 Se una terreno ceduto al gruppo viene venduto, il prezzo di vendita viene diviso in parti uguali fra i membri del gruppo.
 
@@ -1156,7 +1156,7 @@ Scegli un avatar maschile o femminile. Puoi sempre cambiare idea più tardi.
 		<usetemplate name="okcancelbuttons" notext="Femminile" yestext="Maschile"/>
 	</notification>
 	<notification name="NotEnoughCurrency">
-		[NAME] [PRICE]L$ Non hai abbastanza L$ per farlo.
+		[NAME] [PRICE][CURRENCY] Non hai abbastanza [CURRENCY] per farlo.
 	</notification>
 	<notification name="GrantedModifyRights">
 		Ti sono stati accordati i privilegi di modifica degli oggetti di [NAME].
@@ -1284,7 +1284,7 @@ Vuoi avviarne lo scaricamento nella tua cartella applicazioni?
 	</notification>
 	<notification name="DeedObjectToGroup">
 		La cessione di questo oggetto farà in modo che il gruppo:
-* Riceva i L$ pagati all&apos;oggetto
+* Riceva i [CURRENCY] pagati all&apos;oggetto
 		<usetemplate ignoretext="Quando cedi oggetti ai gruppi." name="okcancelignore" notext="Annulla" yestext="Cedi"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
@@ -1463,7 +1463,7 @@ Confermi?
 	<notification label="Cambia la tipologia Linden di accesso alla proprietà" name="ChangeLindenAccess">
 		Stai per cambiare la lista di accesso per una proprietà Linden (mainland, griglia minorenni, orientamento, ecc.).
 
-Questo è PERICOLOSO e dovrebbe essere fatto soltanto per poter lanciare il programma che consente agli oggetti/L$ di essere trasferiti fra griglie diverse.
+Questo è PERICOLOSO e dovrebbe essere fatto soltanto per poter lanciare il programma che consente agli oggetti/[CURRENCY] di essere trasferiti fra griglie diverse.
 Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
@@ -1643,7 +1643,7 @@ Puoi cliccare su &apos;Cambia le preferenze&apos; per aumentare subito le tue pr
 	<notification name="PublishClassified">
 		Ricorda: le tariffe per gli annunci non sono rimborsabili.
 
-Pubblica questo annuncio adesso per [AMOUNT]L$?
+Pubblica questo annuncio adesso per [AMOUNT][CURRENCY]?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="SetClassifiedMature">
@@ -1913,7 +1913,7 @@ Seleziona solo un oggetto e riprova.
 Scegli un solo oggetto e riprova.
 	</notification>
 	<notification name="BuyOriginal">
-		Compra l&apos;oggetto originale da [OWNER] per [PRICE]L$?
+		Compra l&apos;oggetto originale da [OWNER] per [PRICE][CURRENCY]?
 Diventerai proprietario di questo oggetto.
 Sarai in grado di:
  Modificare: [MODIFYPERM]
@@ -1922,7 +1922,7 @@ Sarai in grado di:
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="BuyOriginalNoOwner">
-		Compra l&apos;oggetto originale per [PRICE]L$?
+		Compra l&apos;oggetto originale per [PRICE][CURRENCY]?
 Diventerai proprietario di questo oggetto.
 Sarai in grado di:
  Modificare: [MODIFYPERM]
@@ -1931,7 +1931,7 @@ Sarai in grado di:
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="BuyCopy">
-		Compra una copia da [OWNER] per [PRICE]L$?
+		Compra una copia da [OWNER] per [PRICE][CURRENCY]?
 L&apos;oggetto verrà copiato nel tuo inventario.
 Sarai in grado di:
  Modificare: [MODIFYPERM]
@@ -1940,7 +1940,7 @@ Sarai in grado di:
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="BuyCopyNoOwner">
-		Compra una copia per [PRICE]L$?
+		Compra una copia per [PRICE][CURRENCY]?
 L&apos;oggetto verrà copiato nel tuo inventario.
 Sarai in grado di:
  Modificare: [MODIFYPERM]
@@ -1949,12 +1949,12 @@ Sarai in grado di:
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="BuyContents">
-		Compra il contenuto da [OWNER] per [PRICE]L$?
+		Compra il contenuto da [OWNER] per [PRICE][CURRENCY]?
 Il contenuto verrà copiato nel tuo inventario.
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="BuyContentsNoOwner">
-		Compra il contenuto per [PRICE]L$?
+		Compra il contenuto per [PRICE][CURRENCY]?
 Il contenuto verrà copiato nel tuo inventario.
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
@@ -2387,7 +2387,7 @@ D (Densità) controlla quanto gonfie o spezzettate appaiono le nuvole.
 		Gli elementi non possono essere comprati mentre sono indossati.
 	</notification>
 	<notification label="Informazioni sulle richieste per il permesso di addebito" name="DebitPermissionDetails">
-		Accettare questa richiesta da allo script il permesso continuativo di prendere Linden dollar (L$) dal tuo account. Per revocare questo permesso, il proprietario dell&apos;oggetto deve cancellare l&apos;oggetto oppure reimpostare gli script nell&apos;oggetto.
+		Accettare questa richiesta da allo script il permesso continuativo di prendere Linden dollar ([CURRENCY]) dal tuo account. Per revocare questo permesso, il proprietario dell&apos;oggetto deve cancellare l&apos;oggetto oppure reimpostare gli script nell&apos;oggetto.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="AutoWearNewClothing">
@@ -2449,7 +2449,7 @@ Vuoi visitare il sito di Second Life per impostarle?
 (Durata circa 5 minuti.)
 	</notification>
 	<notification name="UploadPayment">
-		Hai pagato [AMOUNT]L$ per il caricamento.
+		Hai pagato [AMOUNT][CURRENCY] per il caricamento.
 	</notification>
 	<notification name="UploadWebSnapshotDone">
 		Il caricamento della fotografia nel sito web è andato a buon fine.
@@ -2508,7 +2508,7 @@ Dato che questo tasto ha effetto su come scrivi la password, forse sarebbe prefe
 		Non è possibile rimuovere le categorie protette.
 	</notification>
 	<notification name="OfferedCard">
-		Hai offerto un biglietto da visita a [FIRST] [LAST]
+		Hai offerto un biglietto da visita a [NAME]
 	</notification>
 	<notification name="UnableToBuyWhileDownloading">
 		Impossibile acquistare l&apos;oggetto durante il download dei dati.
@@ -2609,7 +2609,7 @@ Se desideri visualizzare il video streaming nei terreni supportati si consiglia
 		Gli oggetti che possiedi sul terreno selezionato ti sono stati restituiti nell&apos;inventario.
 	</notification>
 	<notification name="OtherObjectsReturned">
-		Gli oggetti selezionati sul terreno che è di proprietà di [FIRST] [LAST] sono stati restituiti nel suo inventario.
+		Gli oggetti selezionati sul terreno che è di proprietà di [NAME] sono stati restituiti nel suo inventario.
 	</notification>
 	<notification name="OtherObjectsReturned2">
 		Gli oggetti selezionati sul terreno di proprietà del residente &apos;[NAME]&apos; sono stati restituiti al loro proprietario.
@@ -2738,7 +2738,7 @@ Riprova tra qualche istante.
 		Non è stato trovato nessun territorio valido.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Un oggetto chiamato [OBJECTFROMNAME] di proprietà di [FIRST] [LAST] ti ha dato un [OBJECTTYPE] che si chiama [OBJECTNAME].
+		Un oggetto chiamato [OBJECTFROMNAME] di proprietà di [NAME] ti ha dato un [OBJECTTYPE] che si chiama [OBJECTNAME].
 		<form name="form">
 			<button name="Keep" text="Prendi"/>
 			<button name="Discard" text="Rifiuta"/>
@@ -2817,7 +2817,7 @@ Riprova tra qualche istante.
 		[NAME] ha rifiutato la tua offerta di amicizia.
 	</notification>
 	<notification name="OfferCallingCard">
-		[FIRST] [LAST] ti ha offerto il suo biglietto da visita.
+		[NAME] ti ha offerto il suo biglietto da visita.
 Questo aggiungerà un segnalibro nel tuo inventario.
 in modo da poter rapidamente inviargli un IM al residente.
 		<form name="form">
@@ -2878,7 +2878,7 @@ Accettare tale richiesta?
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
-		[FIRST] [LAST] &apos;[TITLE]&apos;
+[NAME] &apos;[TITLE]&apos; (ch[CHANNEL])
 [MESSAGE]
 		<form name="form">
 			<button name="Ignore" text="Ignora"/>
@@ -2892,12 +2892,12 @@ Accettare tale richiesta?
 		</form>
 	</notification>
 	<notification name="FirstBalanceIncrease">
-		Hai appena ricevuto [AMOUNT]L$.
-Gli oggetti e gli altri utenti possono darti L$.
+		Hai appena ricevuto [AMOUNT][CURRENCY].
+Gli oggetti e gli altri utenti possono darti [CURRENCY].
 Il tuo saldo è indicato nell&apos;angolo in alto a destra dello schermo.
 	</notification>
 	<notification name="FirstBalanceDecrease">
-		Hai appena pagato [AMOUNT]L$.
+		Hai appena pagato [AMOUNT][CURRENCY].
 Il tuo saldo è indicato nell&apos;angolo in alto a destra dello schermo.
 	</notification>
 	<notification name="FirstSit">
diff --git a/indra/newview/skins/default/xui/it/panel_audio_device.xml b/indra/newview/skins/default/xui/it/panel_audio_device.xml
deleted file mode 100644
index 166db8199..000000000
--- a/indra/newview/skins/default/xui/it/panel_audio_device.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="device_settings">
-	<text name="Audio Devices">
-		Periferiche audio
-	</text>
-	<text name="Input device (microphone):">
-		Periferica di input (microfono):
-	</text>
-	<text name="Output device (speakers):">
-		Periferica di Output (altoparlanti):
-	</text>
-	<text name="Input level:">
-		Livello d&apos;ingresso
-	</text>
-	<text_editor name="voice_intro_text1">
-		Sposta il cursore per impostare il livello della tua voce per gli altri residenti. Per controllare il livello di ingresso, parla semplicemente nel microfono.
-	</text_editor>
-	<volume_slider name="mic_volume_slider" tool_tip="Cambia il volume usando il cursore"/>
-	<text name="wait_text">
-		Attendi
-	</text>
-	<string name="default_text">
-		Default
-	</string>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_classified.xml b/indra/newview/skins/default/xui/it/panel_avatar_classified.xml
index 0cc36307b..90ee12d07 100644
--- a/indra/newview/skins/default/xui/it/panel_avatar_classified.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_classified.xml
@@ -25,7 +25,7 @@
 	<button label="Pubblica..." name="classified_update_btn"/>
 	<check_box label="Rinnova automaticamente ogni &#10;settimana" name="auto_renew_check"/>
 	<string name="ad_placed_paid">
-		Inserzione inserita: [DATE], Pagati [AMT] L$ per l&apos;inserzione.
+		Inserzione inserita: [DATE], Pagati [AMT] [CURRENCY] per l&apos;inserzione.
 	</string>
 	<string name="update_txt">
 		Aggiorna
diff --git a/indra/newview/skins/default/xui/it/panel_classified.xml b/indra/newview/skins/default/xui/it/panel_classified.xml
index 54a584a66..4ed833323 100644
--- a/indra/newview/skins/default/xui/it/panel_classified.xml
+++ b/indra/newview/skins/default/xui/it/panel_classified.xml
@@ -19,7 +19,7 @@
 	</combo_box>
 	<button label="Aggiorna" name="classified_update_btn"/>
 	<string name="ad_placed_paid">
-		Inserzione accettata: [DATE], Pagati [AMT] L$ per l&apos;inserzione.
+		Inserzione accettata: [DATE], Pagati [AMT] [CURRENCY] per l&apos;inserzione.
 	</string>
 	<string name="update_txt">
 		Aggiorna
diff --git a/indra/newview/skins/default/xui/it/panel_group_finder.xml b/indra/newview/skins/default/xui/it/panel_group_finder.xml
deleted file mode 100644
index a16353525..000000000
--- a/indra/newview/skins/default/xui/it/panel_group_finder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="GroupInfoFinder" title="Ricerca informazioni sul gruppo">
-	<text name="default_needs_apply_text">
-		Ci sono cambiamenti da applicare nel pannello corrente.
-	</text>
-	<text name="want_apply_text">
-		Vuoi applicare questi cambiamenti?
-	</text>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
index 2c04ec776..6b6dfe85f 100644
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
@@ -28,7 +28,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
 	<text_editor name="charter">
 		Statuto del gruppo
 	</text_editor>
-	<button label="Unisciti (0 L$)" label_selected="Unisciti (0 L$)" name="join_button"/>
+	<button label="Unisciti (0 [CURRENCY])" label_selected="Unisciti (0 [CURRENCY])" name="join_button"/>
 	<button label="Visualizza dettagli" label_selected="Visualizza dettagli" name="info_button"/>
 	<text name="text_owners_and_visible_members">
 		Proprietari &amp; Membri visibili
@@ -47,7 +47,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
 	<panel name="preferences_container">
 		<check_box label="Mostra nella ricerca" name="show_in_group_list" tool_tip="Lascia che i residenti vedano questo gruppo nella ricerca."/>
 		<check_box label="Iscrizione libera" name="open_enrollement" tool_tip="Imposta se questo gruppo permette ai nuovi membri di unirsi senza essere invitati."/>
-		<check_box label="Tassa di iscrizione: L$" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa di iscrizione per unirsi al gruppo."/>
+		<check_box label="Tassa di iscrizione: [CURRENCY]" name="check_enrollment_fee" tool_tip="Imposta se richiedere una tassa di iscrizione per unirsi al gruppo."/>
 		<spinner width="60" left_delta="136" name="spin_enrollment_fee" tool_tip="I nuovi membri devono pagare questa tassa per unirsi al gruppo. La tassa di iscrizione è selezionata."/>
 		<combo_box name="group_mature_check" tool_tip="Imposta se le informazioni sul tuo gruppo sono da considerarsi Mature.">
 			<combo_item name="select_mature">
@@ -73,8 +73,8 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
 		Rilevando i dati dei membri
 	</string>
 	<string name="confirm_group_create_str">
-		Creare questo gruppo ti costerà 100 L$. 
-Sei davvero, davvero, DAVVERO sicuro che vuoi spendere 100 L$ per creare questo gruppo?
+		Creare questo gruppo ti costerà [GROUPCREATEFEE]. 
+Sei davvero, davvero, DAVVERO sicuro che vuoi spendere [GROUPCREATEFEE] per creare questo gruppo?
 Fai attenzione che se nessun altro viene unito al gruppo entro 48 ore, questo gruppo verrà dismesso e il nome del gruppo non sarà più disponibile in futuro.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
index 5f54d8cd2..f737420a4 100644
--- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terra &amp; L$" name="land_money_tab">
+<panel label="Terra &amp; [CURRENCY]" name="land_money_tab">
 	<string name="help_text">
 		I terreni di proprietà del gruppo sono elencati insieme ai dettagli delle contribuzioni. Un avviso viene visualizzato se la superficie totale in uso è inferiore o pari al totale delle contribuzioni. Le schede: Pianificazione, Dettagli e Vendite forniscono informazioni sulle finanze del gruppo.
 	</string>
@@ -55,7 +55,7 @@
 la quantità  di terra in uso.
 	</text>
 	<text name="group_money_heading">
-		L$ del gruppo
+		[CURRENCY] del gruppo
 	</text>
 	<tab_container name="group_money_tab_container">
 		<panel label="Pianificazione" name="group_money_planning_tab">
diff --git a/indra/newview/skins/default/xui/it/panel_place.xml b/indra/newview/skins/default/xui/it/panel_place.xml
index 47c1c2d52..c7559faed 100644
--- a/indra/newview/skins/default/xui/it/panel_place.xml
+++ b/indra/newview/skins/default/xui/it/panel_place.xml
@@ -22,7 +22,7 @@
 		Area: [AREA] m². 
 	</string>
 	<string name="forsale_text">
-		In vendita a [PRICE]L$
+		In vendita a [PRICE][CURRENCY]
 	</string>
 	<string name="auction_text">
 		Asta n. [ID].
diff --git a/indra/newview/skins/default/xui/it/panel_place_small.xml b/indra/newview/skins/default/xui/it/panel_place_small.xml
index 9e1d1391a..2e4181030 100644
--- a/indra/newview/skins/default/xui/it/panel_place_small.xml
+++ b/indra/newview/skins/default/xui/it/panel_place_small.xml
@@ -28,7 +28,7 @@
 		Area: [AREA] m². 
 	</string>
 	<string name="forsale_text">
-		In vendita per [PRICE]L$
+		In vendita per [PRICE][CURRENCY]
 	</string>
 	<string name="auction_text">
 		Asta n. [ID].
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_media.xml b/indra/newview/skins/default/xui/it/panel_preferences_media.xml
deleted file mode 100644
index 0171e69b2..000000000
--- a/indra/newview/skins/default/xui/it/panel_preferences_media.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Audio &amp; Video" name="Media panel">
-	<text name="muting_text">
-		Volume:
-	</text>
-	<text name="streaming_prefs_text" bottom="-195" >
-		Preferenze Streaming:
-	</text>
-	<text name="audio_prefs_text">
-		Preferenze Audio:
-	</text>
-	<panel label="Volume" name="Volume Panel"/>
-	<check_box bottom="-200" height="32" label="Ascolta il canale della musica se è disponibile &#10;
-(usa più banda)" name="streaming_music"/>
-	<check_box bottom_delta="-32" height="32" label="Guarda i video se sono disponibili &#10;
-(usa più banda)" name="streaming_video"/>
-	<check_box bottom_delta="-32" label="Attiva automaticamente i video" name="auto_streaming_video"/>
-	<check_box label="Muta l&apos;audio quando minimizzi la finestra" name="mute_when_minimized"/>
-	<slider label="Effetto Doppler" name="Doppler Effect" label_width="140" width="270" />
-	<slider label="Fattore di Distanza" name="Distance Factor" label_width="140" width="270"/>
-	<slider label="Fattore di Allontanamento" name="Rolloff Factor" label_width="140" width="270"/>
-	<spinner label="Suono di Avviso Transazioni &#8805; a L$" name="L$ Change Threshold" label_width="195" width="259"/>
-	<spinner label="Livello vitale dell&apos;avatar" name="Health Change Threshold" label_width="195" width="259"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_texture.xml b/indra/newview/skins/default/xui/it/panel_region_texture.xml
deleted file mode 100644
index 254700e9f..000000000
--- a/indra/newview/skins/default/xui/it/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texture del terreno" name="Textures">
-	<text name="region_text_lbl">
-		Regione:
-	</text>
-	<text name="region_text">
-		sconosciuto
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texture del terreno (è necessario siano 512x512, 24 bit .tga files)
-	</text>
-	<text name="height_text_lbl">
-		1 (Bassa)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Alta)
-	</text>
-	<text name="height_text_lbl5">
-		Range di elevazione della texture
-	</text>
-	<text name="height_text_lbl6">
-		Sud Ovest
-	</text>
-	<text name="height_text_lbl7">
-		Nord Ovest
-	</text>
-	<text name="height_text_lbl8">
-		Sud Est
-	</text>
-	<text name="height_text_lbl9">
-		Nord Est
-	</text>
-	<spinner label="Bassa" name="height_start_spin_0"/>
-	<spinner label="Bassa" name="height_start_spin_1"/>
-	<spinner label="Bassa" name="height_start_spin_2"/>
-	<spinner label="Bassa" name="height_start_spin_3"/>
-	<spinner label="Alta" name="height_range_spin_0"/>
-	<spinner label="Alta" name="height_range_spin_1"/>
-	<spinner label="Alta" name="height_range_spin_2"/>
-	<spinner label="Alta" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Questi valori rappresentano l&apos;intervallo di miscelazione delle texture qui sopra.
-	</text>
-	<text name="height_text_lbl11">
-		Misurato in metri, il valore più BASSO corrisponde all&apos;altezza MASSIMA della
-	</text>
-	<text name="height_text_lbl12">
-		  Texture #1, e il valore più ALTO all&apos;altezza MINIMA della Texture #4.
-	</text>
-	<button label="Applica" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_top_pick.xml b/indra/newview/skins/default/xui/it/panel_top_pick.xml
deleted file mode 100644
index f96f2af63..000000000
--- a/indra/newview/skins/default/xui/it/panel_top_pick.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Pick" title="Preferiti">
-	<button label="Imposta" name="set_location_btn"/>
-	<button label="Teleportati" name="pick_teleport_btn"/>
-	<button label="Mostra sulla mappa" name="pick_map_btn"/>
-	<text name="sort_order_text">
-		Ordina:
-	</text>
-	<check_box label="Abilitato" name="enabled_check"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_voice_enable.xml b/indra/newview/skins/default/xui/it/panel_voice_enable.xml
deleted file mode 100644
index 6d1bef7b6..000000000
--- a/indra/newview/skins/default/xui/it/panel_voice_enable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="content_panel">
-	<text_editor name="voice_intro_text1">
-		Benvenuti nella voice chat di Second Life! La voice chat ti permette di parlare con gli altri residenti. Questa procedura ti guiderà attraverso i passaggi necessari ad impostare la voice chat. L&apos;uso della voice chat richiede degli altoparlanti e, se si desidera parlare con gli altri, un microfono o cuffie con microfono.
-	</text_editor>
-	<text_editor name="voice_intro_text2">
-		La voice chat è abilitata di default. Vuoi continuare ad usare la voice chat?
-	</text_editor>
-	<radio_group name="voice_enable">
-		<radio_item name="1">
-			Si, continua ad usare la voice chat.
-		</radio_item>
-		<radio_item name="0">
-			No, disabilita la voice chat.
-		</radio_item>
-	</radio_group>
-	<text_editor name="voice_intro_text3">
-		Puoi abilitare voice chat in ogni momento andando nella scheda voice chat del menù Preferenze.
-	</text_editor>
-	<text_editor name="voice_intro_text4">
-		Clicca il bottone &apos;Avanti&apos; per configurare le preferenze di voice chat o clicca &apos;Annulla&apos; per tornare in Second Life.
-	</text_editor>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 0f4595f13..4d12001d0 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -17,7 +17,7 @@
 		Un precedente tentativo di login è fallito. Tentativo di connessione [NUMBER]
 	</string>
 	<string name="LoginPrecaching">
-		Sto caricando Second Life...
+		Sto caricando [SECOND_LIFE]...
 	</string>
 	<string name="LoginInitializingBrowser">
 		Inizializzazione del browser web incorporato...
@@ -83,7 +83,7 @@
 		Tocca
 	</string>
 	<string name="TooltipFlagL$">
-		L$
+		[CURRENCY]
 	</string>
 	<string name="TooltipFlagDropInventory">
 		Prendi dall&apos;inventario
@@ -101,7 +101,7 @@
 		Copia consentita
 	</string>
 	<string name="TooltipForSaleL$">
-		In Vendita: [AMOUNT]L$
+		In Vendita: [AMOUNT][CURRENCY]
 	</string>
 	<string name="TooltipForSaleMsg">
 		In Vendita: [MESSAGE]
@@ -483,4 +483,44 @@
 	<string name="choose_the_directory">
 		Scegli la cartella
 	</string>
+
+  <string name="ScriptQuestionCautionChatGranted">
+	A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato concesso il permesso di: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato negato il permesso di: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	Prendere dollari Linden ([CURRENCY]) da te
+  </string>
+  <string name="ActOnControlInputs">
+	Agire sul tuo controllo degli input
+  </string>
+  <string name="RemapControlInputs">
+	Rimappare il tuo controllo degli input
+  </string>
+  <string name="AnimateYourAvatar">
+	Animare il tuo avatar
+  </string>
+  <string name="AttachToYourAvatar">
+	Far indossare al tuo avatar
+  </string>
+  <string name="ReleaseOwnership">
+	Rilasciare la propietà è far diventare pubblico.
+  </string>
+  <string name="LinkAndDelink">
+	Collegare e scollegare dagli altri oggetti
+  </string>
+  <string name="AddAndRemoveJoints">
+	Aggiungere e rimuovere le giunzioni insieme con gli altri oggetti
+  </string>
+  <string name="ChangePermissions">
+	Cambiare i permessi
+  </string>
+  <string name="TrackYourCamera">
+	Tracciare la fotocamera
+  </string>
+  <string name="ControlYourCamera">
+	Controllare la tua fotocamera
+  </string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml
index 0bc254627..3bba8d579 100644
--- a/indra/newview/skins/default/xui/pt/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml
@@ -4,18 +4,18 @@
 		Nada detectado
 	</text>
 	<text name="bump">
-		[TIME]  [FIRST] [LAST] conflitou com você
+		[TIME]  [NAME] conflitou com você
 	</text>
 	<text name="llpushobject">
-		[TIME]  [FIRST] [LAST] empurrou você com um script
+		[TIME]  [NAME] empurrou você com um script
 	</text>
 	<text name="selected_object_collide">
-		[TIME]  [FIRST] [LAST] o atingiu com um objeto
+		[TIME]  [NAME] o atingiu com um objeto
 	</text>
 	<text name="scripted_object_collide">
-		[TIME]  [FIRST] [LAST] o atingiu com um objeto programado
+		[TIME]  [NAME] o atingiu com um objeto programado
 	</text>
 	<text name="physical_object_collide">
-		[TIME]  [FIRST] [LAST] o atingiu com um objeto físico
+		[TIME]  [NAME] o atingiu com um objeto físico
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
deleted file mode 100644
index cfaec5b41..000000000
--- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="477" name="floater_about" title="Navegador de Mídia" width="570">
-	<layout_stack name="stack1" width="550">
-		<layout_panel name="nav_controls">
-			<button label="Para trás" name="back" width="75"/>
-			<button label="Para a frente" left_delta="75" name="forward" width="90"/>
-			<button label="Recarregar" left_delta="95" name="reload" width="76"/>
-			<combo_box left_delta="80" name="address" width="500"/>
-			<button label="Ir" left_delta="505" name="go" width="35"/>
-		</layout_panel>
-		<layout_panel name="parcel_owner_controls">
-			<button label="Enviar a URL atual para o terreno" name="assign"/>
-		</layout_panel>
-		<layout_panel name="external_controls">
-			<button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>
-			<check_box label="Sempre abrir no meu Navegador de Web" left_delta="201" name="open_always"/>
-			<button label="Fechar" name="close"/>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_web_content.xml b/indra/newview/skins/default/xui/pt/floater_web_content.xml
new file mode 100644
index 000000000..a9f01078a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_web_content.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_web_content" title="Navegador de Mídia">
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button tool_tip="Para trás" name="back"/>
+			<button tool_tip="Para a frente"name="forward"/>
+			<button tool_tip="Recarregar" name="reload"/>
+			<button tool_tip="Abrir no meu Navegador de Web" name="popexternal"/>
+		</layout_panel>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 633a31a34..190a867dc 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -332,7 +332,7 @@ Você não tem [CURRENCY] suficientes para associar-se a este grupo.
 		Criar este grupo custa [CURRENCY]100.
 Grupos ser formados por mais de um membro, caso contrário serão definitivamente excluídos. 
 Convite outros membros dentro de 48 horas.
-		<usetemplate canceltext="Cancelar" name="okcancelbuttons" notext="Cancelar" yestext="Criar grupo por L$100"/>
+		<usetemplate canceltext="Cancelar" name="okcancelbuttons" notext="Cancelar" yestext="Criar grupo por [CURRENCY]100"/>
 	</notification>
 
 	<notification name="LandBuyPass">
@@ -3167,7 +3167,7 @@ Como isto afeta a senha digitada, você provavelmente desejará desativá-lo.
 	</notification>
 
 	<notification name="OfferedCard">
-		Você ofereceu um cartão de visita a [FIRST] [LAST]
+		Você ofereceu um cartão de visita a [NAME]
 	</notification>
 
 	<notification name="UnableToBuyWhileDownloading">
@@ -3595,7 +3595,7 @@ No entanto, esta região tem conteúdo acessível apenas para adultos.
 
 
 	<notification name="OfferCallingCard">
-		[FIRST] [LAST] está oferecendo seu cartão de visita.
+		[NAME] está oferecendo seu cartão de visita.
 Isto adicionará uma anotação em seu inventário, de modo que você possa mandar rapidamente uma IM para este residente.
 		<form name="form">
 			<button name="Accept" text="Aceitar"/>
@@ -3944,7 +3944,7 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="UploadCostConfirmation">
-		O carregamento custa L$[PRICE]. Deseja prosseguir?
+		O carregamento custa [CURRENCY][PRICE]. Deseja prosseguir?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Carregar"/>
 	</notification>
 	<notification name="ConfirmClearTeleportHistory">
@@ -4001,7 +4001,7 @@ Tem certeza de que quer compartilhar os itens abaixo?
 	<notification name="ReleasedLandWithReclaim">
 		O lote de [AREA] m² &apos;[PARCEL_NAME]&apos; foi liberado.
 
-Você tem [RECLAIM_PERIOD] para reivindicá-lo por L$0. Depois o lote será colocado à venda para qualquer interessado.
+Você tem [RECLAIM_PERIOD] para reivindicá-lo por [CURRENCY]0. Depois o lote será colocado à venda para qualquer interessado.
 	</notification>
 	<notification name="ReleasedLandNoReclaim">
 		O lote de [AREA] m² &apos;[PARCEL_NAME]&apos; foi liberado.
@@ -4120,7 +4120,7 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
 		Você encontrará seus pertences no inventário.  Os itens mais novos também ficam na guia Itens recentes.
 	</notification>
 	<notification label="Você tem dólares Linden!" name="HintLindenDollar">
-		Seu saldo de L$ está aqui.  Clique em Comprar L$ para trocar mais dólares Linden.
+		Seu saldo de [CURRENCY] está aqui.  Clique em Comprar [CURRENCY] para trocar mais dólares Linden.
 	</notification>
 	<notification name="LowMemory">
 		Seu pool de memória está baixo. Algumas funções do SL foram desativadas para evitar falhas. Encerre os outros aplicativos. Reinicie o SL se o problema persistir.

From 31b3ae584e357450778026e5bd193158033f80da Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 31 Jan 2014 00:52:59 -0500
Subject: [PATCH 19/25] Feature request: menus on the region estate panel's
 scroll lists.

---
 indra/newview/skins/default/xui/en-us/panel_region_estate.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index 66b2e3d8a..f5ec12029 100644
--- a/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -257,6 +257,7 @@
      left_delta="0"
      multi_select="true"
      name="estate_manager_name_list"
+     menu_num="0"
      bottom_delta="0"
      width="220" />
 
@@ -276,6 +277,7 @@
      left_delta="0"
      multi_select="true"
      name="allowed_avatar_name_list"
+     menu_num="0"
      bottom_delta="0"
      width="220" />
 
@@ -397,6 +399,7 @@
      left_delta="0"
      multi_select="true"
      name="banned_avatar_name_list"
+     menu_num="0"
      bottom_delta="0"
      width="220" />
 

From 31aa30e3d0890041f21482a26d4b6268b20271a4 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sun, 2 Feb 2014 16:27:20 -0500
Subject: [PATCH 20/25] Group Feature Request: Option to Copy SLURL for an
 avatar's profile

Added to avatar list menus and instant message drop down menu.
---
 indra/newview/llimpanel.cpp                   |  3 +++
 indra/newview/llpanelgroup.cpp                |  7 ++----
 indra/newview/llviewermenu.cpp                | 22 +++++++++++++++++++
 .../xui/en-us/floater_instant_message.xml     |  1 +
 ...floater_instant_message_concisebuttons.xml |  1 +
 .../skins/default/xui/en-us/menu_avs_list.xml |  4 ++++
 .../skins/default/xui/en-us/menu_radar.xml    |  4 ++++
 7 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 085d14a2f..d2366f8c9 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -964,6 +964,8 @@ void LLFloaterIMPanel::addDynamics(LLComboBox* flyout)
 	//flyout->add(LLAvatarActions::isBlocked(mOtherParticipantUUID) ? getString("unmute") : getString("mute"), 9);
 }
 
+void copy_profile_uri(const LLUUID& id, bool group = false);
+
 void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
 {
 	if (value.isUndefined())
@@ -978,6 +980,7 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
 	else if (option == 3) LLAvatarActions::teleportRequest(mOtherParticipantUUID);
 	else if (option == 4) LLAvatarActions::pay(mOtherParticipantUUID);
 	else if (option == 5) LLAvatarActions::inviteToGroup(mOtherParticipantUUID);
+	else if (option == -1) copy_profile_uri(mOtherParticipantUUID);
 	else if (option >= 6) // Options that use dynamic items
 	{
 		// First remove them all
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 9e4ef15cc..92ce2545f 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -129,10 +129,7 @@ void LLPanelGroupTab::handleClickHelp()
 	}
 }
 
-static void copy_group_profile_uri(const LLUUID& id)
-{
-	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring("secondlife:///app/group/"+id.asString()+"/about"));
-}
+void copy_profile_uri(const LLUUID& id, bool group);
 
 LLPanelGroup::LLPanelGroup(const LLUUID& group_id)
 :	LLPanel("PanelGroup", LLRect(), FALSE),
@@ -163,7 +160,7 @@ LLPanelGroup::LLPanelGroup(const LLUUID& group_id)
 
 	LLGroupMgr::getInstance()->addObserver(this);
 
-	mCommitCallbackRegistrar.add("Group.CopyURI", boost::bind(copy_group_profile_uri, boost::ref(mID)));
+	mCommitCallbackRegistrar.add("Group.CopyURI", boost::bind(copy_profile_uri, boost::ref(mID), true));
 	// Pass on construction of this panel to the control factory.
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group.xml", &getFactoryMap());
 }
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 102738498..ba83afd25 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9325,6 +9325,18 @@ const uuid_vec_t get_focused_list_ids_selected()
 	return uuid_vec_t();
 }
 
+const LLWString get_slurl_for(const LLUUID& id, bool group)
+{
+	std::string str("secondlife:///app/");
+	str += group ? "group/" : "agent/";
+	return utf8str_to_wstring(str + id.asString() + "/about");
+}
+
+void copy_profile_uri(const LLUUID& id, bool group)
+{
+	gViewerWindow->getWindow()->copyTextToClipboard(get_slurl_for(id, group));
+}
+
 class ListEnableAnySelected : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9412,6 +9424,15 @@ class ListVisibleWebProfile : public view_listener_t
 	}
 };
 
+class ListCopySLURL : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		copy_profile_uri(get_focused_list_id_selected(), false);
+		return true;
+	}
+};
+
 class ListCopyUUIDs : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9939,6 +9960,7 @@ void initialize_menus()
 	addMenu(new ListEnableMute(), "List.EnableMute");
 	addMenu(new ListEnableOfferTeleport(), "List.EnableOfferTeleport");
 	addMenu(new ListVisibleWebProfile(), "List.VisibleWebProfile");
+	addMenu(new ListCopySLURL(), "List.CopySLURL");
 	addMenu(new ListCopyUUIDs(), "List.CopyUUIDs");
 	addMenu(new ListInviteToGroup(), "List.InviteToGroup");
 	addMenu(new ListOfferTeleport(), "List.OfferTeleport");
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 53a441397..43f5a4e1c 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -14,6 +14,7 @@
     <flyout_button bottom="-37" height="20" label="Profile" left="5" name="instant_message_flyout" width="80" list_position="below">
       <flyout_button_item label="Request Teleport" name="request_teleport_item" value="3"/>
       <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
+      <flyout_button_item label="Copy SLURL" name="copy_slurl_item" value="-1"/>
     </flyout_button>
     <string name="ding on" value="Ding on new messages (On)"/>
     <string name="ding off" value="Ding on new messages (Off)"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
index 1901df923..80cb4e3b2 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
@@ -17,6 +17,7 @@
       <flyout_button_item label="Request Teleport" name="request_teleport_item" value="3"/>
       <flyout_button_item label="Pay" name="pay_item" value="4"/>
       <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
+      <flyout_button_item label="Copy SLURL" name="copy_slurl_item" value="-1"/>
     </flyout_button>
     <string name="ding on" value="Ding on new messages (On)"/>
     <string name="ding off" value="Ding on new messages (Off)"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
index 7377eebf9..53fff36bd 100644
--- a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
@@ -66,4 +66,8 @@
     <on_click function="List.CopyUUIDs"/>
     <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"/>
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml
index 8d30d76a6..7f450a889 100644
--- a/indra/newview/skins/default/xui/en-us/menu_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml
@@ -65,6 +65,10 @@
       <on_click function="List.CopyUUIDs"/>
       <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"/>
+    </menu_item_call>
   </menu>
   <menu label="Focusing" name="Focusing" create_jump_keys="true">
     <menu_item_call label="Focus" name="Focus" shortcut="Enter">

From 744e6c63b611ba6dbc713670aeff669fcf7d4f3d Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sun, 2 Feb 2014 16:29:06 -0500
Subject: [PATCH 21/25] Fix Issue 1237: Last online says 01/01/1970 for group
 members

For real this time!
---
 indra/newview/llgroupmgr.cpp          |  2 +-
 indra/newview/llpanelgroupgeneral.cpp |  5 +++--
 indra/newview/llpanelgrouproles.cpp   | 11 +++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index eaef2534b..cc42294fd 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -2049,7 +2049,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
 	for ( ; member_iter_start != member_iter_end; ++member_iter_start)
 	{
 		// Reset defaults
-		online_status = "unknown";
+		online_status = LLTrans::getString("group_member_status_unknown");
 		title = titles[0].asString();
 		contribution = 0;
 		member_powers = default_powers;
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 2b1bbf804..5b58e6b76 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -828,6 +828,8 @@ void LLPanelGroupGeneral::updateMembers()
 	}
 }
 
+bool is_online_status_string(const std::string& status);
+
 void LLPanelGroupGeneral::addMember(LLGroupMemberData* member)
 {
 	// Owners show up in bold.
@@ -845,9 +847,8 @@ void LLPanelGroupGeneral::addMember(LLGroupMemberData* member)
 	item_params.columns.add().column("title").value(member->getTitle()).font/*.name*/("SANSSERIF_SMALL").font_style(style);
 
 	static const LLCachedControl<std::string> format(gSavedSettings, "ShortDateFormat");
-	static const std::string online(LLTrans::getString("group_member_status_online"));
 	item_params.columns.add().column("online").value(member->getOnlineStatus())
-		.format(format).type(member->getOnlineStatus() == online ? "text" : "date")
+		.format(format).type(is_online_status_string(member->getOnlineStatus()) ? "text" : "date")
 		.font/*.name*/("SANSSERIF_SMALL").font_style(style);
 
 	/*LLScrollListItem* member_row =*/ mListVisibleMembers->addNameItemRow(item_params);
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index d713ff9e8..e38bda37b 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -1523,6 +1523,14 @@ void LLPanelGroupMembersSubTab::update(LLGroupChange gc)
 	}
 }
 
+bool is_online_status_string(const std::string& status)
+{
+	static const std::string online(LLTrans::getString("group_member_status_online"));
+	if (status == online) return true;
+	static const std::string unknown(LLTrans::getString("group_member_status_unknown"));
+	return status == unknown;
+}
+
 void LLPanelGroupMembersSubTab::addMemberToList(LLGroupMemberData* data)
 {
 	if (!data) return;
@@ -1538,9 +1546,8 @@ void LLPanelGroupMembersSubTab::addMemberToList(LLGroupMemberData* data)
 			.font/*.name*/("SANSSERIF_SMALL")/*.style("NORMAL")*/;
 
 	static const LLCachedControl<std::string> format(gSavedSettings, "ShortDateFormat");
-	static const std::string online(LLTrans::getString("group_member_status_online"));
 	item_params.columns.add().column("online").value(data->getOnlineStatus())
-			.format(format).type(data->getOnlineStatus() == online ? "text" : "date")
+			.format(format).type(is_online_status_string(data->getOnlineStatus()) ? "text" : "date")
 			.font/*.name*/("SANSSERIF_SMALL")/*.style("NORMAL")*/;
 	mMembersList->addNameItemRow(item_params);
 

From 7341ad5e6ead55a5646eaff39e76f4396333d8e7 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sun, 2 Feb 2014 16:36:05 -0500
Subject: [PATCH 22/25] Support the Script Message API

---
 indra/newview/app_settings/settings.xml | 26 +++++++++++++++++++++++++
 indra/newview/llviewermessage.cpp       | 24 +++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index eceee5233..ce0c3fe93 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -990,6 +990,32 @@ Found in Advanced->Rendering->Info Displays</string>
       <key>Value</key>
       <string/>
     </map>
+    <key>ScriptMessageAPI</key>
+    <map>
+      <key>Comment</key>
+      <string>Channel used for interaction with the Script Message API</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+      <key>IsCOA</key>
+      <integer>1</integer>
+    </map>
+    <key>ScriptMessageAPIKey</key>
+    <map>
+      <key>Comment</key>
+      <string>Key to encode messages sent to the Script Message API</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Enter Key Here</string>
+      <key>IsCOA</key>
+      <integer>1</integer>
+    </map>
     <key>UseConciseIMButtons</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 57316f90c..7a3893e31 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -38,6 +38,7 @@
 #include "llaudioengine.h" 
 #include "llavataractions.h"
 #include "llavatarnamecache.h"
+#include "llbase64.h"
 #include "../lscript/lscript_byteformat.h"	//Need LSCRIPTRunTimePermissionBits and SCRIPT_PERMISSION_*
 #include "lleconomy.h"
 #include "llfocusmgr.h"
@@ -1707,6 +1708,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 	return false;
 }
 
+void script_msg_api(const std::string& msg);
 bool is_spam_filtered(const EInstantMessage& dialog, bool is_friend, bool is_owned_by_me)
 {
 	// First, check the master filter
@@ -1776,6 +1778,8 @@ void inventory_offer_handler(LLOfferInfo* info)
 		return;
 	}
 
+	if (!info->mFromGroup) script_msg_api(info->mFromID.asString() + ", 1");
+
 	// If the user wants to, accept all offers of any kind
 	if (gSavedSettings.getBOOL("AutoAcceptAllNewInventory"))
 	{
@@ -2354,6 +2358,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			buffer = separator_string + message.substr(message_offset);
 
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+			script_msg_api(from_id.asString() + ", 0");
 			// add to IM panel, but do not bother the user
 			gIMMgr->addMessage(
 				session_id,
@@ -2381,6 +2386,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			buffer = separator_string + message.substr(message_offset);
 	
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
+			if (!is_muted) script_msg_api(from_id.asString() + ", 0");
 			bool send_autoresponse = !gIMMgr->hasSession(session_id) || gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat");
 
 			// add to IM panel, but do not bother the user
@@ -2492,6 +2498,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				args["[LONG_TIMESTAMP]"] = formatted_time(timestamp);
 				saved = LLTrans::getString("Saved_message", args);
 			}
+			else if (!mute_im) script_msg_api(from_id.asString() + ", 0");
 			buffer = separator_string + saved + message.substr(message_offset);
 
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
@@ -2590,6 +2597,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 						position,
 						false);
 
+
 				// This block is very similar to the one above, but is necessary, since a session is opened to announce incoming message..
 				// In order to prevent doubling up on the first response, We neglect to send this if Repeat for each message is on.
 				if ((is_autorespond_nonfriends || is_autorespond) && !gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat"))
@@ -2633,6 +2641,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			}
 			LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
 			gIMMgr->processIMTypingStart(im_info);
+			script_msg_api(from_id.asString() + ", 4");
 		}
 		break;
 
@@ -2640,6 +2649,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		{
 			LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
 			gIMMgr->processIMTypingStop(im_info);
+			script_msg_api(from_id.asString() + ", 5");
 		}
 		break;
 
@@ -3049,6 +3059,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				chat.mFromID = LLUUID::null;
 				chat.mSourceType = CHAT_SOURCE_SYSTEM;
 			}
+			else script_msg_api(chat.mFromID.asString() + ", 6");
 
 			// IDEVO Some messages have embedded resident names
 			message = clean_name_from_task_im(message, from_group);
@@ -3280,6 +3291,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 						// <edit>
 						if (IM_LURE_USER == dialog)
 							gAgent.showLureDestination(name, region_handle, pos.mV[VX], pos.mV[VY], pos.mV[VZ]);
+						script_msg_api(from_id.asString().append(IM_LURE_USER == dialog ? ", 2" : ", 3"));
 						// </edit>
 					}
 // [/RLVa:KB]
@@ -3687,6 +3699,17 @@ void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL hist
 // defined in llchatbar.cpp, but not declared in any header
 void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel);
 
+void script_msg_api(const std::string& msg)
+{
+	static const LLCachedControl<S32> channel("ScriptMessageAPI");
+	if (!channel) return;
+	static const LLCachedControl<std::string> key("ScriptMessageAPIKey");
+	std::string str;
+	for (size_t i = 0, keysize = key().size(); i != msg.size(); ++i)
+		str += msg[i] ^ key()[i%keysize];
+	send_chat_from_viewer(LLBase64::encode(reinterpret_cast<const U8*>(str.c_str()), str.size()), CHAT_TYPE_WHISPER, channel);
+}
+
 class AuthHandler : public LLHTTPClient::ResponderWithCompleted
 {
 protected:
@@ -6352,6 +6375,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
 
 		// make notification loggable
 		payload["from_id"] = source_id;
+		if (!is_source_group) script_msg_api(source_id.asString() + ", 7");
 	}
 
 	// Despite using SLURLs, wait until the name is available before

From af58636c7c6dea050398fab9e52c5abc0f44d072 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sun, 2 Feb 2014 16:45:37 -0500
Subject: [PATCH 23/25] Fix the Login Panel such that it persists until a
 successful login and maintains ui values between failed logins

When the login panel used to die, it now hides instead, we only truly kill it upon successful login.
Much of the opening and setting behaviors have been cleaned up to ensure fields are autofilled by the viewer without any user action once
Everything else like changing saved logins will still work the same.
---
 indra/newview/llpanellogin.cpp   | 107 +++++++++++++------------------
 indra/newview/llpanellogin.h     |  21 ++----
 indra/newview/llprogressview.cpp |   9 +--
 indra/newview/llprogressview.h   |   1 -
 indra/newview/llstartup.cpp      |  69 +++-----------------
 indra/newview/llviewerwindow.cpp |   8 ---
 6 files changed, 58 insertions(+), 157 deletions(-)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index f0a950b40..6f0cdf10c 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -159,32 +159,22 @@ LLLoginRefreshHandler gLoginRefreshHandler;
 //---------------------------------------------------------------------------
 // Public methods
 //---------------------------------------------------------------------------
-LLPanelLogin::LLPanelLogin(const LLRect &rect,
-						 void (*callback)(S32 option, void* user_data),
-						 void *cb_data)
-:	LLPanel(std::string("panel_login"), LLRect(0,600,800,0), FALSE),		// not bordered
-	mLogoImage(),
-	mCallback(callback),
-	mCallbackData(cb_data)
+LLPanelLogin::LLPanelLogin(const LLRect& rect)
+:	LLPanel(std::string("panel_login"), rect, FALSE),		// not bordered
+	mLogoImage(LLUI::getUIImage("startup_logo.j2c"))
 {
 	setFocusRoot(TRUE);
 
 	setBackgroundVisible(FALSE);
 	setBackgroundOpaque(TRUE);
 
-	gViewerWindow->abortShowProgress();	//Kill previous instance. It might still be alive, and if so, its probably pending
-										//deletion via the progressviews idle callback. Kill it now and unregister said idle callback.
-
 	LLPanelLogin::sInstance = this;
 
 	// add to front so we are the bottom-most child
 	gViewerWindow->getRootView()->addChildInBack(this);
 
-	// Logo
-	mLogoImage = LLUI::getUIImage("startup_logo.j2c");
-
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_login.xml");
-	
+
 	reshape(rect.getWidth(), rect.getHeight());
 
 	LLComboBox* username_combo(getChild<LLComboBox>("username_combo"));
@@ -243,12 +233,12 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 		LLPanelLogin::onUpdateStartSLURL(start_slurl); // updates grid if needed
 	}
 
-	childSetAction("connect_btn", onClickConnect, this);
 
-	setDefaultBtn("connect_btn");
 	// Also set default button for subpanels, otherwise hitting enter in text entry fields won't login
 	{
 		LLButton* connect_btn(findChild<LLButton>("connect_btn"));
+		connect_btn->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this));
+		setDefaultBtn(connect_btn);
 		findChild<LLPanel>("name_panel")->setDefaultBtn(connect_btn);
 		findChild<LLPanel>("password_panel")->setDefaultBtn(connect_btn);
 		findChild<LLPanel>("grids_panel")->setDefaultBtn(connect_btn);
@@ -287,6 +277,24 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	refreshLoginPage();
 
 	gHippoGridManager->setCurrentGridChangeCallback(boost::bind(&LLPanelLogin::onCurGridChange,this,_1,_2));
+
+	// Load login history
+	std::string login_hist_filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "saved_logins_sg2.xml");
+	mLoginHistoryData = LLSavedLogins::loadFile(login_hist_filepath);
+
+	const LLSavedLoginsList& saved_login_entries(mLoginHistoryData.getEntries());
+	for (LLSavedLoginsList::const_reverse_iterator i = saved_login_entries.rbegin();
+	     i != saved_login_entries.rend(); ++i)
+	{
+		LLSD e = i->asLLSD();
+		if (e.isMap() && gHippoGridManager->getGrid(i->getGrid()))
+			username_combo->add(getDisplayString(*i), e);
+	}
+
+	if (saved_login_entries.size() > 0)
+	{
+		setFields(*saved_login_entries.rbegin());
+	}
 }
 
 void LLPanelLogin::setSiteIsAlive( bool alive )
@@ -355,24 +363,6 @@ LLPanelLogin::~LLPanelLogin()
 	}
 }
 
-void LLPanelLogin::setLoginHistory(LLSavedLogins const& login_history)
-{
-	sInstance->mLoginHistoryData = login_history;
-
-	LLComboBox* login_combo = sInstance->getChild<LLComboBox>("username_combo");
-	llassert(login_combo);
-	login_combo->clear();
-
-	LLSavedLoginsList const& saved_login_entries(login_history.getEntries());
-	for (LLSavedLoginsList::const_reverse_iterator i = saved_login_entries.rbegin();
-	     i != saved_login_entries.rend(); ++i)
-	{
-		LLSD e = i->asLLSD();
-		if (e.isMap() && gHippoGridManager->getGrid(i->getGrid()))
-			login_combo->add(getDisplayString(*i), e);
-	}
-}
-
 // virtual
 void LLPanelLogin::draw()
 {
@@ -449,12 +439,6 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
 	}
 #endif
 
-	if (KEY_RETURN == key && MASK_NONE == mask)
-	{
-		// let the panel handle UICtrl processing: calls onClickConnect()
-		return LLPanel::handleKeyHere(key, mask);
-	}
-
 	return LLPanel::handleKeyHere(key, mask);
 }
 
@@ -514,11 +498,10 @@ void LLPanelLogin::giveFocus()
 
 
 // static
-void LLPanelLogin::show(const LLRect &rect,
-						void (*callback)(S32 option, void* user_data),
-						void* callback_data)
+void LLPanelLogin::show()
 {
-	new LLPanelLogin(rect, callback, callback_data);
+	if (sInstance) sInstance->setVisible(true);
+	else new LLPanelLogin(gViewerWindow->getVirtualWindowRect());
 
 	if( !gFocusMgr.getKeyboardFocus() )
 	{
@@ -892,28 +875,24 @@ bool LLPanelLogin::getRememberLogin()
 //---------------------------------------------------------------------------
 
 // static
-void LLPanelLogin::onClickConnect(void *)
+void LLPanelLogin::onClickConnect()
 {
-	if (sInstance && sInstance->mCallback)
+	// JC - Make sure the fields all get committed.
+	gFocusMgr.setKeyboardFocus(NULL);
+
+	std::string first, last, password;
+	if (nameSplit(getChild<LLComboBox>("username_combo")->getTextEntry(), first, last))
 	{
-
-		// JC - Make sure the fields all get committed.
-		gFocusMgr.setKeyboardFocus(NULL);
-
-		std::string first, last, password;
-		if (nameSplit(sInstance->getChild<LLComboBox>("username_combo")->getTextEntry(), first, last))
-		{
-			// has both first and last name typed
-			sInstance->mCallback(0, sInstance->mCallbackData);
-		}
-		else
-		{
-			if (gHippoGridManager->getCurrentGrid()->getRegisterUrl().empty()) {
-				LLNotificationsUtil::add("MustHaveAccountToLogInNoLinks");
-			} else {
-				LLNotificationsUtil::add("MustHaveAccountToLogIn", LLSD(), LLSD(),
-												LLPanelLogin::newAccountAlertCallback);
-			}
+		// has both first and last name typed
+		LLStartUp::setStartupState(STATE_LOGIN_CLEANUP);
+	}
+	else
+	{
+		if (gHippoGridManager->getCurrentGrid()->getRegisterUrl().empty()) {
+			LLNotificationsUtil::add("MustHaveAccountToLogInNoLinks");
+		} else {
+			LLNotificationsUtil::add("MustHaveAccountToLogIn", LLSD(), LLSD(),
+											LLPanelLogin::newAccountAlertCallback);
 		}
 	}
 }
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index b1a7ff935..05c4c3b18 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -49,18 +49,15 @@ class LLPanelLogin:
 {
 	LOG_CLASS(LLPanelLogin);
 public:
-	LLPanelLogin(const LLRect &rect,
-				void (*callback)(S32 option, void* user_data),
-				void *callback_data);
+	LLPanelLogin(const LLRect& rect = LLRect());
 	~LLPanelLogin();
 
 	virtual BOOL handleKeyHere(KEY key, MASK mask);
 	virtual void draw();
 	virtual void setFocus( BOOL b );
 
-	static void show(const LLRect &rect, 
-		void (*callback)(S32 option, void* user_data), 
-		void* callback_data);
+	static void show();
+	static void hide() { if (sInstance) sInstance->setVisible(false); }
 
 	// Remember password checkbox is set via gSavedSettings "RememberPassword"
 
@@ -69,7 +66,6 @@ public:
 	 * @param	firstname	First name value.
 	 * @param	lastname	Last name value.
 	 * @param	password	Password, as plaintext or munged.
-	 * @param	is_secondlife True if First/Last refer to a SecondLife(tm) account.
 	 */
 	static void setFields(const std::string& firstname, const std::string& lastname,
 						  const std::string& password);
@@ -110,7 +106,7 @@ private:
 	void reshapeBrowser();
 	void onLocationSLURL();
 
-	static void onClickConnect(void*);
+	void onClickConnect();
 	static void onClickNewAccount();
 	static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
 	static void onClickGrids(void*);
@@ -124,10 +120,6 @@ private:
 	static void clearPassword();
 
 public:
-	/**
-	 * @brief	Set the login history data.
-	 */
-	static void setLoginHistory(LLSavedLogins const& login_history);
 
 	/**
 	 * @brief	Returns the login history data.
@@ -144,14 +136,9 @@ public:
 	 */
 	static bool getRememberLogin();
 
-	//static void selectFirstElement(void);
-
 private:
 	LLPointer<LLUIImage> mLogoImage;
 
-	void			(*mCallback)(S32 option, void *userdata);
-	void*			mCallbackData;
-
 	std::string mIncomingPassword;
 	std::string mMungedPassword;
 
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index cbaa5d47e..23981e565 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -135,13 +135,6 @@ void LLProgressView::revealIntroPanel()
 	gIdleCallbacks.addFunction(onIdle, this);
 }
 
-void LLProgressView::abortShowProgress()
-{
-	mFadeFromLoginTimer.stop();
-	LLPanelLogin::close();
-	gIdleCallbacks.deleteFunction(onIdle, this);
-}
-
 void LLProgressView::setStartupComplete()
 {
 	mStartupComplete = true;
@@ -334,7 +327,7 @@ void LLProgressView::onIdle(void* user_data)
 		self->mFadeFromLoginTimer.getElapsedTimeF32() > FADE_TO_WORLD_TIME)
 	{
 		self->mFadeFromLoginTimer.stop();
-		LLPanelLogin::close();
+		LLPanelLogin::hide();
 
 		// Nothing to do anymore.
 		gIdleCallbacks.deleteFunction(onIdle, user_data);
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
index 816305efd..bff970e29 100644
--- a/indra/newview/llprogressview.h
+++ b/indra/newview/llprogressview.h
@@ -62,7 +62,6 @@ public:
 	void setMessage(const std::string& msg);
 	
 	void revealIntroPanel();
-	void abortShowProgress();
 
 	void setStartupComplete();
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 0cf590cd8..2077ccfec 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -291,8 +291,7 @@ boost::scoped_ptr<LLViewerStats::PhaseMap> LLStartUp::sPhases(new LLViewerStats:
 // local function declaration
 //
 
-void login_show(LLSavedLogins const& saved_logins);
-void login_callback(S32 option, void* userdata);
+void login_show();
 void show_first_run_dialog();
 bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
@@ -882,24 +881,17 @@ bool idle_startup()
 			gViewerWindow->setShowProgress(FALSE);
 			display_startup();
 			
-			// Load login history
-			std::string login_hist_filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "saved_logins_sg2.xml");
-			LLSavedLogins login_history = LLSavedLogins::loadFile(login_hist_filepath);
-			display_startup();
-			
 			// Show the login dialog.
-			login_show(login_history);
+			login_show();
 			display_startup();
-			if (login_history.size() > 0)
-			{
-				LLPanelLogin::setFields(*login_history.getEntries().rbegin());
-			}
-			else
+			static bool sSetFields(LLPanelLogin::getLoginHistory().size() > 0);  // If there were no entries to be loaded, use what's available
+			if (!sSetFields)
 			{
 				LLPanelLogin::setFields(firstname, lastname, password);
+				sSetFields = true; // Never reset the fields again!
+				display_startup();
+				LLPanelLogin::giveFocus();
 			}
-			display_startup();
-			LLPanelLogin::giveFocus();
 
 			gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
 
@@ -1416,6 +1408,7 @@ bool idle_startup()
 				// Yay, login!
 				successful_login = true;
 				Debug(if (gCurlIo) dc::curlio.off());		// Login succeeded: restore dc::curlio to original state.
+				LLPanelLogin::close(); // Singu Note: Actually destroy the login panel here, otherwise user interaction gets lost upon failed login.
 			}
 			else if(login_response == "indeterminate")
 			{
@@ -2712,59 +2705,17 @@ bool idle_startup()
 // local function definition
 //
 
-void login_show(LLSavedLogins const& saved_logins)
+void login_show()
 {
 	LL_INFOS("AppInit") << "Initializing Login Screen" << LL_ENDL;
 
 
 	// This creates the LLPanelLogin instance.
-	LLPanelLogin::show(	gViewerWindow->getVirtualWindowRect(),
-						login_callback, NULL );
-
-	// Now that the LLPanelLogin instance is created,
-	// store the login history there.
-	LLPanelLogin::setLoginHistory(saved_logins);
+	LLPanelLogin::show();
 
 	// UI textures have been previously loaded in doPreloadImages()
 }
 
-// Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
-void login_callback(S32 option, void *userdata)
-{
-	const S32 CONNECT_OPTION = 0;
-	const S32 QUIT_OPTION = 1;
-
-	if (CONNECT_OPTION == option)
-	{
-		LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
-		return;
-	}
-	else if (QUIT_OPTION == option)
-	{
-		// Make sure we don't save the password if the user is trying to clear it.
-		std::string first, last, password;
-		LLPanelLogin::getFields(&first, &last, &password);
-		if (!gSavedSettings.getBOOL("RememberPassword"))
-		{
-			// turn off the setting and write out to disk
-			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-		}
-
-		// Next iteration through main loop should shut down the app cleanly.
-		LLAppViewer::instance()->userQuit();
-		
-		if (LLAppViewer::instance()->quitRequested())
-		{
-			LLPanelLogin::close();
-		}
-		return;
-	}
-	else
-	{
-		LL_WARNS("AppInit") << "Unknown login button clicked" << LL_ENDL;
-	}
-}
-
 
 // static
 std::string LLStartUp::loadPasswordFromDisk()
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 4f2e5c931..e5ae8553c 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5137,14 +5137,6 @@ void LLViewerWindow::revealIntroPanel()
 	}
 }
 
-void LLViewerWindow::abortShowProgress()
-{
-	if (mProgressView)
-	{
-		mProgressView->abortShowProgress();
-	}
-}
-
 void LLViewerWindow::setShowProgress(const BOOL show)
 {
 	if (mProgressView)

From b0972de510dbdfa9dc94fe16d8134e35e4b44847 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sun, 2 Feb 2014 16:53:55 -0500
Subject: [PATCH 24/25] Address Issue 1371: Enhancement: in Edit object
 Positions X & Y for OpenSim VarRegion

---
 indra/newview/llpanelobject.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 77363270a..1cf09178e 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -552,6 +552,8 @@ void LLPanelObject::getState( )
 	mBtnCopySize->setEnabled( enable_scale );
 	mBtnPasteSize->setEnabled( enable_scale );
 	mBtnPasteSizeClip->setEnabled( enable_scale );
+	mCtrlPosX->setMaxValue(objectp->getRegion()->getWidth());
+	mCtrlPosY->setMaxValue(objectp->getRegion()->getWidth()); // Singu TODO: VarRegions, getLength()
 	mCtrlPosZ->setMaxValue(gHippoLimits->getMaxHeight());
 	mCtrlScaleX->setMaxValue(gHippoLimits->getMaxPrimScale());
 	mCtrlScaleY->setMaxValue(gHippoLimits->getMaxPrimScale());

From 2acfbf12ed809a6a28d660a01607875bf1a4a941 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 3 Feb 2014 17:20:25 -0500
Subject: [PATCH 25/25] Fix Issue 1368: Camera viewing angle resets after
 mouselook.

Only reset FOV when right click was held or released just before leaving, now.
---
 indra/newview/lltoolcomp.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 3f3470e04..1f6ae81cf 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -780,7 +780,11 @@ void	LLToolCompGun::handleSelect()
 void	LLToolCompGun::handleDeselect()
 {
 	LLToolComposite::handleDeselect();
-	LLViewerCamera::getInstance()->loadDefaultFOV(); // Singu Note: Load Default FOV in case we were zoomed in
+	if (mRightMouseButton || mTimerFOV.getStarted()) // Singu Note: Load Default FOV if we were zoomed in
+	{
+		LLViewerCamera::getInstance()->loadDefaultFOV();
+		mRightMouseButton = false;
+	}
 	setMouseCapture(FALSE);
 }