From aa1fc0d6e16a0c89f276f5c1b7ef2de10fc5800f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 2 Oct 2009 02:36:21 -0700
Subject: Draw selected avatars last (and fixed silver skin missing selection
 color)

---
 linden/indra/newview/llnetmap.cpp                  | 31 ++++++++++++++++++----
 linden/indra/newview/skins/default/colors_base.xml |  2 +-
 linden/indra/newview/skins/silver/colors_base.xml  |  1 +
 3 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index f055dbc..dc4a4ae 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -345,7 +345,7 @@ void LLNetMap::draw()
 		LLColor4 muted_color = gColors.getColor( "MapMuted" );
 		LLColor4 selected_color = gColors.getColor( "MapSelected" );
 		LLColor4 glyph_color;
-		F32 glyph_radius;
+		int selected = -1;
 
 		std::vector<LLUUID> avatar_ids;
 		std::vector<LLVector3d> positions;
@@ -356,14 +356,14 @@ void LLNetMap::draw()
 			// just be careful to sort the avatar IDs along with the positions. -MG
 			pos_map = globalPosToView(positions[i], rotate_map);
 			
+			// Save this entry to draw last
 			if (LLFloaterMap::getSelected() == avatar_ids[i])
 			{
-				glyph_radius = mDotRadius * 1.7f;
-				glyph_color = selected_color;
+				selected = i;
+				continue;
 			}
 			else
 			{
-				glyph_radius = mDotRadius;
 				// Show them muted even if they're friends
 				if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
 				{
@@ -392,7 +392,7 @@ void LLNetMap::draw()
 				pos_map.mV[VX], pos_map.mV[VY], 
 				glyph_color, 
 				pos_map.mV[VZ],
-				glyph_radius);
+				mDotRadius);
 
 			F32	dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
 			if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
@@ -402,6 +402,27 @@ void LLNetMap::draw()
 			}
 		}
 
+		// Draw dot for selected avatar last
+		if (selected >= 0)
+		{
+			pos_map = globalPosToView(positions[selected], rotate_map);
+			F32 glyph_radius = mDotRadius * 1.7f;
+			glyph_color = selected_color;
+
+			LLWorldMapView::drawAvatar(
+				pos_map.mV[VX], pos_map.mV[VY], 
+				glyph_color, 
+				pos_map.mV[VZ],
+				glyph_radius);
+
+			F32	dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
+			if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
+			{
+				closest_dist = dist_to_cursor;
+				mClosestAgentToCursor = avatar_ids[selected];
+			}
+		}
+
 		// Draw dot for autopilot target
 		if (gAgent.getAutoPilot())
 		{
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 8f0fc29..854c027 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -162,7 +162,7 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
-<MapSelected value="255, 0, 0, 255" />                 <!-- Selected avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 6a94489..f129230 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -162,6 +162,7 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
  
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
-- 
cgit v1.1


From 58aab90cbff6035a2e31bde404b8ceda1fc3ca66 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 2 Oct 2009 05:17:31 -0700
Subject: Draw Imprudence developers as purple dots in the mini-map (name list
 in LLFloaterMap)

---
 linden/indra/newview/llfloatermap.cpp              | 15 +++++++++++++++
 linden/indra/newview/llfloatermap.h                |  2 ++
 linden/indra/newview/llnetmap.cpp                  |  7 ++++++-
 linden/indra/newview/skins/default/colors_base.xml |  1 +
 linden/indra/newview/skins/silver/colors_base.xml  |  1 +
 5 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 6d23ab4..c60f07f 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -194,6 +194,21 @@ void LLFloaterMap::open()
 */
 
 //static
+bool LLFloaterMap::isImpDev(LLUUID agent_id)
+{
+	// We use strings here as avatar keys change across grids. 
+	// Feel free to add/remove yourself.
+	std::string agent_name = getSelectedName(agent_id);
+	if (agent_name == "McCabe Maxsted" || 
+		agent_name == "Jacek Antonelli" ||
+		agent_name == "Armin Weatherwax")
+	{
+		return true;
+	}
+	return false;
+}
+
+//static
 void LLFloaterMap::updateRadar()
 {
 	LLFloaterMap::getInstance()->populateRadar();
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 81e4159..349b0e6 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -49,6 +49,8 @@ public:
 
 	static void updateRadar();
 	static LLUUID getSelected();
+	// returns true if agent_id belongs to a developer listed in llfloatermap.cpp
+	static bool isImpDev(LLUUID agent_id);
 
 	BOOL postBuild();
 
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index dc4a4ae..5aaee1a 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -344,6 +344,7 @@ void LLNetMap::draw()
 		LLColor4 friend_color = gColors.getColor( "MapFriend" );
 		LLColor4 muted_color = gColors.getColor( "MapMuted" );
 		LLColor4 selected_color = gColors.getColor( "MapSelected" );
+		LLColor4 imp_dev_color = gColors.getColor( "MapImpDev" );
 		LLColor4 glyph_color;
 		int selected = -1;
 
@@ -369,6 +370,10 @@ void LLNetMap::draw()
 				{
 					glyph_color = muted_color;
 				}
+				else if (LLFloaterMap::isImpDev(avatar_ids[i]))
+				{
+					glyph_color = imp_dev_color;
+				}
 				else if (is_agent_friend(avatar_ids[i]))
 				{
 					glyph_color = friend_color;
@@ -403,7 +408,7 @@ void LLNetMap::draw()
 		}
 
 		// Draw dot for selected avatar last
-		if (selected >= 0)
+		if (selected >= 0 && avatar_ids[selected].notNull())
 		{
 			pos_map = globalPosToView(positions[selected], rotate_map);
 			F32 glyph_radius = mDotRadius * 1.7f;
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 854c027..14265e0 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -163,6 +163,7 @@
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
 <MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index f129230..6dc98dc 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -163,6 +163,7 @@
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
 <MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
  
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
-- 
cgit v1.1


From 9d165087f0d812315c4ecb4078f3ee163160c50b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 2 Oct 2009 05:20:43 -0700
Subject: Added mini-map partner dot color for future use (currently unused)

---
 linden/indra/newview/skins/default/colors_base.xml | 1 +
 linden/indra/newview/skins/silver/colors_base.xml  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index 14265e0..b90f8aa 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -164,6 +164,7 @@
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
 <MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
 <MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
+<MapPartner value="214, 40, 107, 255" />                <!-- (unused) Your avatar's partner's glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 6dc98dc..f9bf283 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -164,6 +164,7 @@
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
 <MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
 <MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
+<MapPartner value="214, 40, 107, 255" />                <!-- (unused) Your avatar's partner's glyph color -->
  
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
-- 
cgit v1.1


From 153e86b038796e5f449bd084f432a18e12725c6b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 2 Oct 2009 22:18:02 -0700
Subject: Applied clickable object names for whisper/say/shout from Emerald
 viewer

---
 linden/indra/newview/llviewermessage.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index d900cd9..47231fb 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2436,6 +2436,32 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		is_owned_by_me = chatter->permYouOwner();
 	}
 
+	if(chat.mSourceType == CHAT_SOURCE_OBJECT 
+		&& chat.mChatType != CHAT_TYPE_DEBUG_MSG
+		&& !owner_id.isNull()
+		&& owner_id != gAgent.getID())
+	{
+		std::string tempname = from_name;
+
+		size_t found = tempname.find(" ");
+		while(found != std::string::npos)
+		{
+			tempname.replace(found, 1, "");
+			found = tempname.find(" ");
+		}
+
+		if (tempname.length() < 1)
+		{
+			from_name = "no name";
+			chat.mFromName = from_name;
+		}
+
+		//        std::string ownername;
+		//        if(gCacheName->getFullName(owner_id,ownername))
+		//            from_name += (" (" + ownername + ")");
+		chat.mURL = llformat("secondlife:///app/agent/%s/about",owner_id.asString().c_str());
+	}
+
 	if (is_audible)
 	{
 		BOOL visible_in_chat_bubble = FALSE;
-- 
cgit v1.1


From 955eebfadc1299505d66eee7886ef41ea888a30a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 04:04:04 -0700
Subject: Object IMs are now prefixed with 'IM: '. As a side effect, names are
 now clickable when show IMs in chat is enabled

---
 linden/indra/newview/llfloaterchat.cpp   | 20 ++++++++++++++++----
 linden/indra/newview/llviewermessage.cpp |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 1f34ad0..a4082fd 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -213,11 +213,23 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
 	}
 
 	// If the chat line has an associated url, link it up to the name.
-	if (!chat.mURL.empty()
-		&& (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
+	if (!chat.mURL.empty() && 
+		(line.length() > chat.mFromName.length() && 
+		(line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0)))
 	{
-		std::string start_line = line.substr(0, chat.mFromName.length() + 1);
-		line = line.substr(chat.mFromName.length() + 1);
+		std::string start_line;
+		if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: "
+		{
+			start_line = line.substr(4, chat.mFromName.length() + 1);
+			std::string source = line.substr(0, 4);
+			edit->appendColoredText(source, false, prepend_newline, color);
+			line = line.substr(chat.mFromName.length() + 5);
+		}
+		else
+		{
+			start_line = line.substr(0, chat.mFromName.length() + 1);
+			line = line.substr(chat.mFromName.length() + 1);
+		}
 		const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
 		edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
 		prepend_newline = false;
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 47231fb..e01aa4f 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1929,7 +1929,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			{
 				return;
 			}
-			chat.mText = name + separator_string + message.substr(message_offset);
+			chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
 			chat.mFromName = name;
 
 			// Build a link to open the object IM info window.
-- 
cgit v1.1


From f6c7d16cbcfc04448917fd726548471085f7bf37 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 04:10:17 -0700
Subject: Fixed 1.2 beta features missing from silver skin

---
 .../skins/silver/xui/en-us/floater_chatterbox.xml  | 12 -----------
 .../silver/xui/en-us/floater_windlight_options.xml | 24 ++++++++++++++--------
 2 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml

(limited to 'linden')

diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
deleted file mode 100644
index 025a616..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="390" name="floater_chatterbox"
-     rect_control="ChatterboxRect" title="Communicate" width="392">
-<icon enabled="false" image_name="tabarea.tga"
-	     bg_alpha_color="blue" color="DefaultShadowLight" border="false"
-	     bottom="-389" follows="left|right|bottom" height="17" left="1" scale_image="true"
-	     mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon>
-    <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
-	     name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />
-</multi_floater>
-
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
index 11859cc..d801251 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
@@ -4,29 +4,35 @@
      min_width="400" mouse_opaque="true" name="WindLight floater"
      rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
 	     font="SansSerif" h_pad="0" halign="left" height="16"
 	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
 	     width="110">
-		Sky Presets:
-	</text>
-	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+    Sky Presets:
+  </text>
+  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
 	     left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
 	     width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+	     mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+	     mouse_opaque="true" name="next" scale_image="true" width="20" />
 	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="New" label_selected="New" left_delta="170"
+	     label="New" label_selected="New" left_delta="40"
 	     mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
 	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left_delta="80"
+	     label="Save" label_selected="Save" left_delta="70"
 	     mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
 	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Delete" label_selected="Delete" left_delta="80"
+	     label="Delete" label_selected="Delete" left_delta="70"
 	     mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
 	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
 	     label="Day Cycle Editor" label_selected="Day Cycle Editor"
-	     left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-	     scale_image="true" width="120" />
+	     left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
+	     scale_image="true" width="125" />
 	<tab_container bottom="-220" follows="left|top" height="160" left="0"
 	     mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
 		<panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
-- 
cgit v1.1


From da8dc22e3763a9767aa943add592f514c5f2ebea Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 06:10:48 -0700
Subject: Added new color setting for Object IMs

---
 linden/indra/llcommon/llchat.h                     |  3 +-
 linden/indra/newview/app_settings/settings.xml     | 16 ++++++++++
 linden/indra/newview/llfloaterchat.cpp             |  3 ++
 linden/indra/newview/llviewermessage.cpp           |  2 +-
 .../default/xui/en-us/panel_preferences_chat.xml   | 35 ++++++++++++----------
 5 files changed, 42 insertions(+), 17 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index 6c75a25..4ec9a08 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -42,7 +42,8 @@ typedef enum e_chat_source_type
 {
 	CHAT_SOURCE_SYSTEM = 0,
 	CHAT_SOURCE_AGENT = 1,
-	CHAT_SOURCE_OBJECT = 2
+	CHAT_SOURCE_OBJECT = 2,
+	CHAT_SOURCE_OBJECT_IM = 3
 } EChatSourceType;
 
 typedef enum e_chat_type
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7cc10af..84baa99 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5449,6 +5449,22 @@
          <real>1</real>
       </array>
     </map>
+    <key>ObjectIMColor</key>
+    <map>
+      <key>Comment</key>
+      <string>Color of IMs from objects</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>0.699999988079</real>
+        <real>0.899999976158</real>
+        <real>0.699999988079</real>
+        <real>1</real>
+      </array>
+    </map>
     <key>OpenDebugStatAdvanced</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a4082fd..cc86fce 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -548,6 +548,9 @@ LLColor4 get_text_color(const LLChat& chat)
 				text_color = gSavedSettings.getColor4("ObjectChatColor");
 			}
 			break;
+		case CHAT_SOURCE_OBJECT_IM:
+			text_color = gSavedSettings.getColor4("ObjectIMColor");
+			break;
 		default:
 			text_color.setToWhite();
 		}
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index e01aa4f..9b7ec48 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1966,7 +1966,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 			// Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
 			// IMs from objcts don't open IM sessions.
-			chat.mSourceType = CHAT_SOURCE_OBJECT;
+			chat.mSourceType = CHAT_SOURCE_OBJECT_IM;
 			LLFloaterChat::addChat(chat, FALSE, FALSE);
 		}
 		break;
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index b0384cf..6233cbe 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -33,44 +33,49 @@
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
 	     enabled="true" follows="left|top" height="56" label="You" left="148"
-	     mouse_opaque="true" name="user" width="44" />
+	     mouse_opaque="true" name="user" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-	     enabled="true" follows="left|top" height="56" label="Others" left_delta="48"
-	     mouse_opaque="true" name="agent" width="44" />
+	     enabled="true" follows="left|top" height="56" label="Others" left_delta="68"
+	     mouse_opaque="true" name="agent" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="0.6 0.6 1 1"
-	     enabled="true" follows="left|top" height="56" label="IM" left_delta="48"
-	     mouse_opaque="true" name="im" width="44" />
+	     enabled="true" follows="left|top" height="56" label="IMs" left_delta="68"
+	     mouse_opaque="true" name="im" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="0.8 1 1 1"
 	     enabled="true" follows="left|top"
-	     height="56" label="System" left_delta="48" mouse_opaque="true"
-	     name="system" width="44" />
+	     height="56" label="System" left_delta="68" mouse_opaque="true"
+	     name="system" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
 	     can_apply_immediately="true" color="0.82 0.82 0.99 1"
 	     control_name="ScriptErrorColor" enabled="true" follows="left|top"
-	     height="56" label="Errors" left_delta="48" mouse_opaque="true"
-	     name="script_error" width="44" />
+	     height="56" label="Errors" left_delta="68" mouse_opaque="true"
+	     name="script_error" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
 	     control_name="ObjectChatColor" enabled="true" follows="left|top"
 	     height="56" label="Objects" left="148" mouse_opaque="true"
-	     name="objects" width="44" />
+	     name="objects" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
+       control_name="ObjectIMColor" enabled="true" follows="left|top"
+	     height="56" label="Object IMs" left_delta="68" mouse_opaque="true"
+       name="object_ims" width="54" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
+	     can_apply_immediately="true" color="0.7 0.9 0.7 1"
 	     enabled="true" follows="left|top"
-	     height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
-	     width="44" />
+	     height="56" label="Owner" left_delta="68" mouse_opaque="true" name="owner"
+	     width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0 0 0 1"
 	     enabled="true" follows="left|top"
-	     height="56" label="Bubble" left_delta="48" mouse_opaque="true"
-	     name="background" width="44" />
+	     height="56" label="Bubble" left_delta="68" mouse_opaque="true"
+	     name="background" width="54" />
 	<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
 	     can_apply_immediately="true" color="0.6 0.6 1 1"
 	     enabled="true" follows="left|top" height="56"
-	     label="URLs" left_delta="48" mouse_opaque="true" name="links" width="44" />
+	     label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-- 
cgit v1.1


From dee58cbfe4ce6890c20f942bfe9884cb2bd70328 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 07:00:46 -0700
Subject: Fixed search window height being too small for new profile layout

---
 .../skins/default/xui/en-us/floater_directory.xml  | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 09c4f31..fe04ad3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
+     can_resize="true" height="590" min_height="590" min_width="780"
      name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
      width="780">
-	<tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
+	<tab_container bottom="-590" follows="left|top|right|bottom" height="570" left="0"
 	     mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		<panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
 		     label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
 			<string name="searching_text">
 				Searching...
@@ -67,7 +67,7 @@
 			</string>
       <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
     </panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		<panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
 		     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
 		     name="classified_panel" width="778">
 			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
@@ -140,7 +140,7 @@
 			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
 			     height="20" label="Delete" label_selected="Delete" left="80"
 			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			<scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true" 			     follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="339">
 				<column label="" name="icon" width="24" />
 				<column label="" name="type" width="-1" />
@@ -152,8 +152,8 @@
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
-		<panel border="true" bottom="-549" default_tab_group="1"
-		     follows="left|top|right|bottom" height="533" label="Events" left="1"
+		<panel border="true" bottom="-569" default_tab_group="1"
+		     follows="left|top|right|bottom" height="553" label="Events" left="1"
 		     mouse_opaque="false" name="events_panel" width="778">
 			<string name="searching_text">
 				Searching...
@@ -251,8 +251,8 @@
 			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
 			     height="20" label="Delete" label_selected="Delete" left="80"
 			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			<scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true" 
+			     follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="339">
 				<column label="" name="icon" width="24" />
 				<column label="" name="type" width="-1" />
@@ -272,7 +272,7 @@
 			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
 			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
 		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		<panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
 		     label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
 		     width="778">
         <string name="searching_text">Searching...</string>
@@ -304,7 +304,7 @@
         <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
         <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
     </panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		<panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
 		     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
 		     width="778">
 			<string name="searching_text">
@@ -370,8 +370,8 @@
 				Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
 To buy direct, visit the land and click on the place name in the title bar.
 			</text>
-			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			<scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true" 
+			     follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="387">
 				<column label="" name="icon" width="24" />
 				<column label="" name="type" width="-1" />
@@ -385,7 +385,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		<panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
 		     label="Places" left="1" mouse_opaque="false" name="places_panel"
 		     width="778">
 			<string name="searching_text">
@@ -458,10 +458,10 @@ To buy direct, visit the land and click on the place name in the title bar.
 			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
 			     name="Search" width="70" />
-			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+			<scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
 			     draw_heading="true" 
 			     
-			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			     follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="339">
 				<column label="" name="icon" width="24" />
 				<column label="" name="type" width="-1" />
@@ -473,7 +473,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+    <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
 		     label="People" left="1" mouse_opaque="false" name="people_panel"
 		     width="778">
 			<string name="searching_text">
@@ -500,10 +500,10 @@ To buy direct, visit the land and click on the place name in the title bar.
       <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
 			     label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
 			     name="Search" width="70" />
-      <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+      <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
 			     draw_heading="true" 
                                
-			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			     follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
 			     multi_select="false" name="results" search_column="2" width="326">
         <column label="" name="icon" width="24" />
         <column label="" name="type" width="-1" />
@@ -514,7 +514,7 @@ To buy direct, visit the land and click on the place name in the title bar.
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
 			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+    <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
 		     label="Groups" left="1" mouse_opaque="false"
 		     name="groups_panel"
 		     width="778">
@@ -580,19 +580,19 @@ To buy direct, visit the land and click on the place name in the title bar.
       <string name="default_search_page">"http://secondlife.com/app/search/index_groups.php?"</string>
     </panel>
 	</tab_container>
-	<panel bottom="-560" follows="right|top" height="470" left="340"
+	<panel bottom="-580" follows="right|top" height="490" left="340"
 	     name="classified_details_panel" width="440" />
-	<panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
+	<panel bottom="-580" follows="right|top" height="506" left="350" name="Panel Avatar"
 	     width="430" />
-	<panel bottom="-560" follows="right|top" height="470" left="340"
+	<panel bottom="-560" follows="right|top" height="490" left="340"
 	     name="event_details_panel" width="440" />
-	<panel bottom="-580" follows="right|top" height="515" left="350"
+	<panel bottom="-600" follows="right|top" height="535" left="350"
 	     name="group_details_panel_holder" width="430">
-		<panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
+		<panel bottom="0" follows="right|top" height="490" left="0" name="group_details_panel"
 		     width="430" />
 	</panel>
-	<panel bottom="20" follows="right|top" height="470" left="340"
+	<panel bottom="20" follows="right|top" height="490" left="340"
 	     name="place_details_panel" width="440" />
-	<panel bottom="20" follows="right|top" height="470" left="385"
+	<panel bottom="20" follows="right|top" height="490" left="385"
 	     name="place_details_small_panel" width="395" />
 </floater>
-- 
cgit v1.1


From 60c2a946c2d1d760ce02edad62697d9d0efbfb79 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 11:17:31 -0700
Subject: Fixed an issue with llkeywords.cpp(385) and Visual Studio

---
 linden/indra/llui/llkeywords.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index b7e7d87..3580567 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -380,9 +380,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 					seg_start = cur - base;
 					cur += cur_delimiter->getLength();
 					
-					if( cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER || LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
+					LLKeywordToken::TOKEN_TYPE type = cur_delimiter->getType();
+					if (type == LLKeywordToken::TWO_SIDED_DELIMITER || type == LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
 					{
-						llassert( cur_delimiter->getDelimiter() != NULL );
 						while( *cur && !cur_delimiter->isTail(cur))
 						{
 							// Check for an escape sequence.
-- 
cgit v1.1


From aaac0f4f9ea6911f2b49d1bc3bd83da0ea5bf8f9 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 11:26:40 -0700
Subject: Fixed account label not showing up in profiles

---
 linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index b811a66..921cd8e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -71,7 +71,7 @@
 			     label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
 			     width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-29" drop_shadow_visible="true" follows="left|top"
+			     bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
 			     mouse_opaque="true" name="label" v_pad="0" width="145">
         Born:
@@ -84,17 +84,17 @@
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
-			     mouse_opaque="true" name="label2" v_pad="0" width="345">
+			     mouse_opaque="true" name="label2" v_pad="0" width="145">
         Account:
       </text>
-      <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-12"
+      <view_border bevel_style="in" bottom_delta="-52" follows="left|top" height="52" right="-12"
 			     mouse_opaque="false" name="acct_border" width="145" />
       <text bg_visible="false" border_drop_shadow_visible="false"
 			     border_visible="true" bottom_delta="0" drop_shadow_visible="true"
 			     follows="left|top" font="SansSerifSmall" height="48" left="264"
 			     mouse_opaque="false" name="acct" width="121" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+			     bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
 			     mouse_opaque="true" name="partner_label"
 			     tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-- 
cgit v1.1


From 640d11fbd63858bf82fa7ae3affc24032da73258 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 19:35:17 -0700
Subject: Fixed extern C issue in llmediaimplgstreamer.h for Windows

---
 linden/indra/llmedia/llmediaimplgstreamer.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 51a8c37..8d2e756 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -40,12 +40,13 @@
 ///#if LL_GSTREAMER_ENABLED
 
 extern "C" {
-#include <stdio.h>
 #include <gst/gst.h>
+}
 
+#include <stdio.h>
 #include "apr_pools.h"
 #include "apr_dso.h"
-}
+
 
 #include "llmediaimplgstreamervidplug.h"
 #include "llgstplaythread.h"
-- 
cgit v1.1


From e1ca383cf4023b3a8b16a681e1d433c38ba836e8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 22:21:18 -0700
Subject: Added confirmation alerts for double-click tp and auto-pilot

---
 linden/indra/newview/llviewermenu.cpp              | 73 ++++++++++++++--------
 .../newview/skins/default/xui/en-us/alerts.xml     | 32 +++++++++-
 2 files changed, 77 insertions(+), 28 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index f9ae401..d11bc02 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -494,6 +494,7 @@ BOOL enable_detach(void*);
 BOOL enable_region_owner(void*);
 void menu_toggle_attached_lights(void* user_data);
 void menu_toggle_attached_particles(void* user_data);
+static void handle_go_to_callback(S32 option, void *userdata);
 
 class LLMenuParcelObserver : public LLParcelObserver
 {
@@ -2392,45 +2393,63 @@ bool handle_go_to()
 	}
 // [/RLVa:KB]
 
-	// JAMESDEBUG try simulator autopilot
-	std::vector<std::string> strings;
-	std::string val;
-	LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
 	if (gSavedSettings.getBOOL("DoubleClickTeleport"))
 	{
-		LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
-		gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
-		gAgent.teleportViaLocation(pos + hips_offset);
+		gViewerWindow->alertXml("ConfirmDoubleClickTP", handle_go_to_callback, (void*)LLToolPie::getInstance());
 	}
-	else
+	else if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+	{
+		gViewerWindow->alertXml("ConfirmAutoPilot", handle_go_to_callback, (void*)LLToolPie::getInstance());
+	}
+	return true;
+}
+
+//static
+void handle_go_to_callback(S32 option, void *userdata)
+{
+	if (option == 0)
 	{
+		LLToolPie* pie = (LLToolPie*)userdata;
+
 		// JAMESDEBUG try simulator autopilot
 		std::vector<std::string> strings;
 		std::string val;
-		val = llformat("%g", pos.mdV[VX]);
-		strings.push_back(val);
-		val = llformat("%g", pos.mdV[VY]);
-		strings.push_back(val);
-		val = llformat("%g", pos.mdV[VZ]);
-		strings.push_back(val);
-		send_generic_message("autopilot", strings);
-
-		LLViewerParcelMgr::getInstance()->deselectLand();
-
-		if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
+		LLVector3d pos = pie->getPick().mPosGlobal;
+		if (gSavedSettings.getBOOL("DoubleClickTeleport"))
 		{
-			gAgent.setFocusGlobal(gAgent.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID());
+			LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
+			gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+			gAgent.teleportViaLocation(pos + hips_offset);
 		}
-		else 
+		else
 		{
-			// Snap camera back to behind avatar
-			gAgent.setFocusOnAvatar(TRUE, ANIMATE);
-		}
+			// JAMESDEBUG try simulator autopilot
+			std::vector<std::string> strings;
+			std::string val;
+			val = llformat("%g", pos.mdV[VX]);
+			strings.push_back(val);
+			val = llformat("%g", pos.mdV[VY]);
+			strings.push_back(val);
+			val = llformat("%g", pos.mdV[VZ]);
+			strings.push_back(val);
+			send_generic_message("autopilot", strings);
+
+			LLViewerParcelMgr::getInstance()->deselectLand();
+
+			if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
+			{
+				gAgent.setFocusGlobal(gAgent.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID());
+			}
+			else 
+			{
+				// Snap camera back to behind avatar
+				gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+			}
 
-		// Could be first use
-		LLFirstUse::useGoTo();
+			// Could be first use
+			LLFirstUse::useGoTo();
+		}
 	}
-	return true;
 }
 
 class LLGoToObject : public view_listener_t
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index acac138..d0ac192 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5093,7 +5093,37 @@ Would you like to visit the Second Life website to set this up?
 		</message>
 	</alert>
 
-	<alert modal="true" name="ConfirmTeleportHome">
+  <alert modal="true" name="ConfirmAutoPilot">
+    <message name="message">
+      Are you sure you want to move here?
+    </message>
+    <ignore name="ignore">
+      When using auto-pilot
+    </ignore>
+    <option name="Move">
+      Move
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+  
+  <alert modal="true" name="ConfirmDoubleClickTP">
+    <message name="message">
+      Are you sure you want to teleport here?
+    </message>
+    <ignore name="ignore">
+      When double-click teleporting
+    </ignore>
+    <option name="Teleport">
+      Teleport
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+
+  <alert modal="true" name="ConfirmTeleportHome">
 		<message name="message">
 			Are you sure you want to teleport home?
 		</message>
-- 
cgit v1.1


From 49734bd3e51516690f71f104a4a3249aabfb669e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 23:19:49 -0700
Subject: Reverted slviewer-0-v12100-AllowDiscardForCreator.patch (Was causing
 usability issues with new notecard creation)

---
 linden/indra/newview/llviewermessage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9b7ec48..cecef95 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -837,9 +837,9 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 		//if we are throttled, don't display them - Gigs
 		if (check_offer_throttle(from_name, false))
 		{
-			// I'm not sure this is a good idea.  JC  -  Definitely a bad idea.  HB
-			//bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-			bool show_keep_discard = true;
+			// I'm not sure this is a good idea.  JC
+			bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
+			//bool show_keep_discard = true;
 			switch(asset_type)
 			{
 			case LLAssetType::AT_NOTECARD:
-- 
cgit v1.1


From c65438efe588203da81ef62d99c1921f304482c6 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 3 Oct 2009 23:47:59 -0700
Subject: Fixed layout of debug permissions in tools window

---
 .../indra/newview/skins/default/xui/en-us/floater_tools.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 00f3f3e..880ba85 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -530,37 +530,37 @@
 				</combo_item>
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-115" drop_shadow_visible="true" follows="left|top"
+			     bottom="-135" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
 			     mouse_opaque="true" name="B:" v_pad="0" width="174">
 				B:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-115" drop_shadow_visible="true" follows="left|top"
+			     bottom="-135" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="O:" v_pad="0" width="124">
 				O;
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-115" drop_shadow_visible="true" follows="left|top"
+			     bottom="-135" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="G:" v_pad="0" width="74">
 				G:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-127" drop_shadow_visible="true" follows="left|top"
+			     bottom="-147" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
 			     mouse_opaque="true" name="E:" v_pad="0" width="174">
 				E:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-127" drop_shadow_visible="true" follows="left|top"
+			     bottom="-147" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="N:" v_pad="0" width="124">
 				N:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-127" drop_shadow_visible="true" follows="left|top"
+			     bottom="-147" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="F:" v_pad="0" width="74">
 				F:
-- 
cgit v1.1


From 06a08bbd9505f0f2334dd42695243bafdee8b71a Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 4 Oct 2009 22:03:58 +0200
Subject: test this as a fix for logout crash #2

	modified:   linden/indra/newview/llviewermenu.cpp
	modified:   linden/indra/newview/llviewerregion.cpp
---
 linden/indra/newview/llviewermenu.cpp   | 3 ++-
 linden/indra/newview/llviewerregion.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index ba24c16..0e9e3d9 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6285,6 +6285,8 @@ class LLAttachmentEnableDrop : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
+		if (gDisconnected)
+			return true;
 		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 		BOOL can_build   = gAgent.isGodlike() || (parcel && parcel->getAllowModify());
 
@@ -6335,7 +6337,6 @@ class LLAttachmentEnableDrop : public view_listener_t
 // [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
 		bool new_value = enable_detach(NULL) && can_build && item && (!gRlvHandler.hasBehaviour(RLV_BHVR_REZ));
 // [/RLVa:KB]
-
 		gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 		return true;
 	}
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 1c527e0..d7f1c80 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -906,10 +906,12 @@ bool LLViewerRegion::isAlive()
 
 BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
 {
-	if (mParcelOverlay)
+	if (mParcelOverlay && !gDisconnected)
 	{
 		return mParcelOverlay->isOwnedSelf(pos);
-	} else {
+	} 
+	else 
+	{
 		return FALSE;
 	}
 }
-- 
cgit v1.1


From 92046e276e55b45ec281f1637a18fa176ed21587 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 4 Oct 2009 22:59:14 +0200
Subject: er ... offtopic: add ctrl-alt-shift-d as shortcut to toggle advanced
 for linux because ctrl-alt-d is minimize all windows

	modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 9da0ec5..1a486e4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -421,6 +421,10 @@
       <on_click function="View.ToggleAdvanced" userdata="" />
       <on_check function="View.CheckAdvanced" />
     </menu_item_check>
+    <menu_item_check  shortcut="control|alt|shift|D">
+	    <on_click function="View.ToggleAdvanced" userdata="" />
+	    <on_check function="View.CheckAdvanced" />
+    </menu_item_check>
   </menu>
 
 
-- 
cgit v1.1


From b5f977a6b3757aa785346d20a8f7b29858506d42 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 4 Oct 2009 09:12:16 -0700
Subject: Mini-map radar now notifies when someone enters chat range, and how
 far away they are

---
 linden/indra/newview/app_settings/settings.xml     | 11 +++
 linden/indra/newview/llfloatermap.cpp              | 89 ++++++++++++++++++++--
 linden/indra/newview/llfloatermap.h                | 14 +++-
 linden/indra/newview/llpanelgeneral.cpp            |  2 +
 .../skins/default/xui/en-us/floater_mini_map.xml   |  3 +
 .../xui/en-us/panel_preferences_general.xml        |  5 ++
 6 files changed, 112 insertions(+), 12 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 84baa99..8a13b85 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5044,6 +5044,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>MiniMapNotify</key>
+    <map>
+      <key>Comment</key>
+      <string>Notify when avatars enter chat range</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>MiniMapPrimMaxRadius</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index c60f07f..9992d9c 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -43,8 +43,10 @@
 #include "lluictrlfactory.h"
 
 // radar
+#include "llchat.h"
 #include "llfirstuse.h"
 #include "llfloateravatarinfo.h"
+#include "llfloaterchat.h"
 #include "llfloaterfriends.h"
 #include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
@@ -69,13 +71,15 @@ LLFloaterMap::LLFloaterMap(const LLSD& key)
 	:
 	LLFloater(std::string("minimap")),
 	mPanelMap(NULL),
-	mUpdate(TRUE)
+	mUpdate(TRUE),
+	mSelectedAvatar(LLUUID::null)
+
 {
 	LLCallbackMap::map_t factory_map;
 	factory_map["mini_mapview"] = LLCallbackMap(createPanelMiniMap, this);
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
 
-	mSelectedAvatar.setNull();
+	mChatAvatars.clear();
 }
 
 
@@ -262,6 +266,33 @@ void LLFloaterMap::populateRadar()
 			}
 // [/RLVa:KB]
 
+			// check if they're in chat range and notify user
+			LLVector3d temp = positions[i] - current_pos;
+			F32 distance = llround((F32)temp.magVec(), 0.1f);
+			std::stringstream dist;
+			dist.str("");
+			dist << distance;
+
+			if (gSavedSettings.getBOOL("MiniMapNotify"))
+			{
+				if (distance <= 20.0f)
+				{
+					if (!getInChatList(avatar_ids[i]))
+					{
+						addToChatList(avatar_ids[i], dist.str());
+					}
+				}
+				else
+				{
+					if (getInChatList(avatar_ids[i]))
+					{
+						removeFromChatList(avatar_ids[i]);
+					}
+				}
+
+				updateChatList(avatar_ids);
+			}
+
 			std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
 			element["id"] = avatar_ids[i];
 			element["columns"][0]["column"] = "avatar_name";
@@ -269,12 +300,7 @@ void LLFloaterMap::populateRadar()
 			element["columns"][0]["value"] = fullname + " " + mute_text;
 			element["columns"][1]["column"] = "avatar_distance";
 			element["columns"][1]["type"] = "text";
-
-			LLVector3d temp = positions[i] - current_pos;
-			F32 distance = (F32)temp.magVec();
-			char dist[32];
-			snprintf(dist, sizeof(dist), "%.1f", distance);
-			element["columns"][1]["value"] = strcat(dist,"m");
+			element["columns"][1]["value"] = dist.str()+"m";
 
 			mRadarList->addElement(element, ADD_BOTTOM);
 		}
@@ -306,6 +332,53 @@ void LLFloaterMap::populateRadar()
 	//llinfos << "mSelectedAvatar: " << mSelectedAvatar.asString() << llendl;
 }
 
+void LLFloaterMap::updateChatList(std::vector<LLUUID> agent_ids)
+{
+	std::set<LLUUID>::iterator it;
+	std::vector<LLUUID>::iterator result;
+	for (it = mChatAvatars.begin(); it != mChatAvatars.end(); )
+	{
+		result = find(agent_ids.begin(), agent_ids.end(), *it);
+		if (result == agent_ids.end())
+		{
+			mChatAvatars.erase(it++);
+		}
+		else
+		{
+			it++;
+		}
+	}
+}
+
+bool LLFloaterMap::getInChatList(LLUUID agent_id)
+{
+	if (mChatAvatars.count(agent_id) > 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+void LLFloaterMap::addToChatList(LLUUID agent_id, std::string distance)
+{
+	mChatAvatars.insert(agent_id);
+	LLChat chat;
+
+	LLUIString notify = getString("entering_chat_range");
+	notify.setArg("[NAME]", getSelectedName(agent_id));
+	notify.setArg("[DISTANCE]", distance);
+
+	chat.mText = notify;
+	chat.mSourceType = CHAT_SOURCE_SYSTEM;
+	LLFloaterChat::addChat(chat, FALSE, FALSE);	
+}
+
+void LLFloaterMap::removeFromChatList(LLUUID agent_id)
+{
+	// Do we want to add a notice?
+	mChatAvatars.erase(agent_id);
+}
+
 void LLFloaterMap::toggleButtons()
 {
 	BOOL enable = FALSE;
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 349b0e6..deb972b 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -66,10 +66,11 @@ public:
 private:
 	LLFloaterMap(const LLSD& key = LLSD());
 
-	LLNetMap*						mPanelMap;
-	LLScrollListCtrl*				mRadarList;
-	LLUUID							mSelectedAvatar;
-	bool							mUpdate;
+	LLNetMap*				mPanelMap;
+	LLScrollListCtrl*		mRadarList;
+	LLUUID					mSelectedAvatar;
+	std::set<LLUUID>		mChatAvatars; 
+	bool					mUpdate;
 	
 	static void onList(LLUICtrl* ctrl, void* user_data);
 	static void onRangeChange(LLFocusableElement* focus, void* user_data);
@@ -78,6 +79,11 @@ private:
 	void toggleButtons();
 	void populateRadar();
 
+	void updateChatList(std::vector<LLUUID> agent_ids);
+	bool getInChatList(LLUUID agent_id);
+	void addToChatList(LLUUID agent_id, std::string distance);
+	void removeFromChatList(LLUUID agent_id);
+
 	static void onClickProfile(void* user_data);
 	static void onClickIM(void* user_data);
 	static void onClickAddFriend(void* user_data);
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index e416401..4cf4091 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -60,6 +60,7 @@ BOOL LLPanelGeneral::postBuild()
 	childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
 	childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
 	childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
+	childSetValue("mini_map_notify", gSavedSettings.getBOOL("MiniMapNotify"));
 	childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
 	childSetValue("use_system_color_picker_checkbox", gSavedSettings.getBOOL("UseDefaultColorPicker"));
 	childSetValue("show_search_panel", gSavedSettings.getBOOL("ShowSearchBar"));
@@ -97,6 +98,7 @@ void LLPanelGeneral::apply()
 	gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
 	gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
 	gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
+	gSavedSettings.setBOOL("MiniMapNotify", childGetValue("mini_map_notify"));
 	gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
 	gSavedSettings.setBOOL("UseDefaultColorPicker", childGetValue("use_system_color_picker_checkbox"));
 	gSavedSettings.setBOOL("ShowSearchBar", childGetValue("show_search_panel"));
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 3ae02e7..2cb46b7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -95,4 +95,7 @@
   <string name="muted">
     (muted)
   </string>
+  <string name="entering_chat_range">
+    [NAME] has entered chat range ([DISTANCE]m)
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index bb1c5ee..56bdb28 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -77,6 +77,11 @@
 	     follows="left|top" height="16" increment="1" initial_val="300"
 	     label="Away Timeout:" label_width="141" left="10" max_val="600"
 	     min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
+  <check_box bottom_delta="-25" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Display mini-map messages in chat" left="151"
+	     mouse_opaque="true" name="mini_map_notify" radio_style="false"
+	     width="256" />
 	<check_box bottom="-304" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Notify when Linden dollars (L$) spent or received" left="151"
-- 
cgit v1.1


From 2c7ec0675ebfa21c548fd7eba4e13b01a7171be3 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 4 Oct 2009 14:25:33 -0700
Subject: Clear list of avs in chat range when setting disabled

---
 linden/indra/newview/llfloatermap.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 9992d9c..4e3ffa3 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -292,6 +292,10 @@ void LLFloaterMap::populateRadar()
 
 				updateChatList(avatar_ids);
 			}
+			else if (!mChatAvatars.empty())
+			{
+				mChatAvatars.clear();
+			}
 
 			std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
 			element["id"] = avatar_ids[i];
-- 
cgit v1.1


From f41ffc75aaebbbd122b36443ffb4813948d682aa Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 4 Oct 2009 16:15:52 -0700
Subject: Fixed mini-map distance label and rounding

---
 linden/indra/newview/llfloatermap.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 4e3ffa3..200c60d 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -269,17 +269,17 @@ void LLFloaterMap::populateRadar()
 			// check if they're in chat range and notify user
 			LLVector3d temp = positions[i] - current_pos;
 			F32 distance = llround((F32)temp.magVec(), 0.1f);
-			std::stringstream dist;
-			dist.str("");
-			dist << distance;
+			char dist[32];
+			sprintf(dist, "%.1f", distance);
+			std::string dist_string = dist;
 
 			if (gSavedSettings.getBOOL("MiniMapNotify"))
 			{
-				if (distance <= 20.0f)
+				if (distance < 20.0f)
 				{
 					if (!getInChatList(avatar_ids[i]))
 					{
-						addToChatList(avatar_ids[i], dist.str());
+						addToChatList(avatar_ids[i], dist_string);
 					}
 				}
 				else
@@ -304,7 +304,7 @@ void LLFloaterMap::populateRadar()
 			element["columns"][0]["value"] = fullname + " " + mute_text;
 			element["columns"][1]["column"] = "avatar_distance";
 			element["columns"][1]["type"] = "text";
-			element["columns"][1]["value"] = dist.str()+"m";
+			element["columns"][1]["value"] = dist_string+"m";
 
 			mRadarList->addElement(element, ADD_BOTTOM);
 		}
-- 
cgit v1.1


From edd36f4d24f67a63e94e06961bd8f516be9ee06c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 4 Oct 2009 16:34:19 -0700
Subject: Revert "er ... offtopic: add ctrl-alt-shift-d as shortcut to toggle
 advanced for linux"

This reverts commit 92046e276e55b45ec281f1637a18fa176ed21587.
---
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 1a486e4..9da0ec5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -421,10 +421,6 @@
       <on_click function="View.ToggleAdvanced" userdata="" />
       <on_check function="View.CheckAdvanced" />
     </menu_item_check>
-    <menu_item_check  shortcut="control|alt|shift|D">
-	    <on_click function="View.ToggleAdvanced" userdata="" />
-	    <on_check function="View.CheckAdvanced" />
-    </menu_item_check>
   </menu>
 
 
-- 
cgit v1.1


From 3a519a998c4d3ebd3cfcbe632a67b6c37c45860f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 4 Oct 2009 22:44:41 -0700
Subject: Changes that should improve sculpty LOD

---
 linden/indra/llmath/llvolume.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 5603a9c..9aa02ee 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -2198,10 +2198,16 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
 	S32 requested_sizeS = 0;
 	S32 requested_sizeT = 0;
 
-	sculpt_calc_mesh_resolution(sculpt_width, sculpt_height, sculpt_type, mDetail, requested_sizeS, requested_sizeT);
+	// create oblong sculpties with high LOD always
+	F32 sculpt_detail = mDetail;
+	if (sculpt_width != sculpt_height && sculpt_detail < 4.0)
+	{
+		sculpt_detail = 4.0;
+	}
+	sculpt_calc_mesh_resolution(sculpt_width, sculpt_height, sculpt_type, sculpt_detail, requested_sizeS, requested_sizeT);
 
-	mPathp->generate(mParams.getPathParams(), mDetail, 0, TRUE, requested_sizeS);
-	mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), mDetail, 0, TRUE, requested_sizeT);
+	mPathp->generate(mParams.getPathParams(), sculpt_detail, 0, TRUE, requested_sizeS);
+	mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), sculpt_detail, 0, TRUE, requested_sizeT);
 
 	S32 sizeS = mPathp->mPath.size();         // we requested a specific size, now see what we really got
 	S32 sizeT = mProfilep->mProfile.size();   // we requested a specific size, now see what we really got
-- 
cgit v1.1


From 87d10f1a67e1b6bb990b94ff1ca69cd084137e7a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 5 Oct 2009 02:03:49 -0700
Subject: Renamed 'Create' in object pie to 'Build,' moved it to top right and
 switched 'Wear' and 'Return'

---
 .../skins/default/xui/en-us/menu_pie_object.xml    | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index b1d16a2..e962a8a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -29,21 +29,22 @@
 			<on_click function="Object.Delete" />
 			<on_enable function="Object.EnableDelete" />
 		</menu_item_call>
-		<menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
-			<on_click function="Object.AttachToAvatar" />
-			<on_enable function="Object.EnableWear" />
-		</menu_item_call>
-		<menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
-			<on_click function="Tools.TakeCopy" />
-			<on_enable function="Tools.EnableTakeCopy" />
-		</menu_item_call>
-		<pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
-		<pie_menu label="Attach &gt;" name="Object Attach" />
-		<menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
-			<on_click function="Object.Return" />
-			<on_enable function="Object.EnableReturn" />
-		</menu_item_call>
-		<pie_menu label="More &gt;" name="Rate Menu">
+    <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create">
+      <on_click function="Object.Build" />
+      <on_enable function="EnableEdit" />
+    </menu_item_call>
+
+    <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
+      <on_click function="Tools.TakeCopy" />
+      <on_enable function="Tools.EnableTakeCopy" />
+    </menu_item_call>
+    <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
+    <pie_menu label="Attach &gt;" name="Object Attach" />
+    <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
+      <on_click function="Object.AttachToAvatar" />
+      <on_enable function="Object.EnableWear" />
+    </menu_item_call>
+    <pie_menu label="More &gt;" name="Rate Menu">
       <menu_item_call label="Export" enabled="false" hidden="false"
                       mouse_opaqu="true" name="Export">
         <on_click function="Object.Export" />
@@ -74,10 +75,10 @@
         <on_click function="Tools.Unlink" userdata="" />
         <on_enable function="Tools.EnableUnlink" />
       </menu_item_call>
-		</pie_menu>
-    <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
-      <on_click function="Object.Build" />
-      <on_enable function="EnableEdit" />
+    </pie_menu>
+    <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
+      <on_click function="Object.Return" />
+      <on_enable function="Object.EnableReturn" />
     </menu_item_call>
 	</pie_menu>
 	<menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
-- 
cgit v1.1


From baff7828246eefe8a79da2a7daff7afe6863147e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 5 Oct 2009 07:09:51 -0700
Subject: Tiny improvement to radar code

---
 linden/indra/newview/llfloatermap.cpp | 123 +++++++++++++++++-----------------
 1 file changed, 62 insertions(+), 61 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 200c60d..e90e3b4 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -238,6 +238,10 @@ void LLFloaterMap::populateRadar()
 
 	LLVector3d current_pos = gAgent.getPositionGlobal();
 
+	// clear count
+	std::stringstream avatar_count; 
+	avatar_count.str("");
+
 	// find what avatars you can see
 	std::vector<LLUUID> avatar_ids;
 	std::vector<LLVector3d> positions;
@@ -247,88 +251,85 @@ void LLFloaterMap::populateRadar()
 
 	mRadarList->deleteAllItems();
 
-	for (U32 i=0; i<avatar_ids.size(); i++)
+	if (!avatar_ids.empty())
 	{
-		if (avatar_ids[i] == gAgent.getID() ||
-			avatar_ids[i].isNull())
-		{
-			continue;
-		}
-
-		// Add to list only if we get their name
-		std::string fullname = getSelectedName(avatar_ids[i]);
-		if (!fullname.empty())
+		for (U32 i=0; i<avatar_ids.size(); i++)
 		{
-// [RLVa:KB] - Alternate: Imprudence-1.2.0
-			if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+			if (avatar_ids[i] == gAgent.getID() ||
+				avatar_ids[i].isNull())
 			{
-				fullname = gRlvHandler.getAnonym(fullname);
+				continue;
 			}
-// [/RLVa:KB]
-
-			// check if they're in chat range and notify user
-			LLVector3d temp = positions[i] - current_pos;
-			F32 distance = llround((F32)temp.magVec(), 0.1f);
-			char dist[32];
-			sprintf(dist, "%.1f", distance);
-			std::string dist_string = dist;
 
-			if (gSavedSettings.getBOOL("MiniMapNotify"))
+			// Add to list only if we get their name
+			std::string fullname = getSelectedName(avatar_ids[i]);
+			if (!fullname.empty())
 			{
-				if (distance < 20.0f)
+	// [RLVa:KB] - Alternate: Imprudence-1.2.0
+				if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
 				{
-					if (!getInChatList(avatar_ids[i]))
-					{
-						addToChatList(avatar_ids[i], dist_string);
-					}
+					fullname = gRlvHandler.getAnonym(fullname);
 				}
-				else
+	// [/RLVa:KB]
+
+				// check if they're in chat range and notify user
+				LLVector3d temp = positions[i] - current_pos;
+				F32 distance = llround((F32)temp.magVec(), 0.1f);
+				char dist[32];
+				sprintf(dist, "%.1f", distance);
+				std::string dist_string = dist;
+
+				if (gSavedSettings.getBOOL("MiniMapNotify"))
 				{
-					if (getInChatList(avatar_ids[i]))
+					if (distance < 20.0f)
 					{
-						removeFromChatList(avatar_ids[i]);
+						if (!getInChatList(avatar_ids[i]))
+						{
+							addToChatList(avatar_ids[i], dist_string);
+						}
+					}
+					else
+					{
+						if (getInChatList(avatar_ids[i]))
+						{
+							removeFromChatList(avatar_ids[i]);
+						}
 					}
-				}
 
-				updateChatList(avatar_ids);
-			}
-			else if (!mChatAvatars.empty())
-			{
-				mChatAvatars.clear();
-			}
+					updateChatList(avatar_ids);
+				}
+				else if (!mChatAvatars.empty())
+				{
+					mChatAvatars.clear();
+				}
 
-			std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
-			element["id"] = avatar_ids[i];
-			element["columns"][0]["column"] = "avatar_name";
-			element["columns"][0]["type"] = "text";
-			element["columns"][0]["value"] = fullname + " " + mute_text;
-			element["columns"][1]["column"] = "avatar_distance";
-			element["columns"][1]["type"] = "text";
-			element["columns"][1]["value"] = dist_string+"m";
+				std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
+				element["id"] = avatar_ids[i];
+				element["columns"][0]["column"] = "avatar_name";
+				element["columns"][0]["type"] = "text";
+				element["columns"][0]["value"] = fullname + " " + mute_text;
+				element["columns"][1]["column"] = "avatar_distance";
+				element["columns"][1]["type"] = "text";
+				element["columns"][1]["value"] = dist_string+"m";
 
-			mRadarList->addElement(element, ADD_BOTTOM);
+				mRadarList->addElement(element, ADD_BOTTOM);
+			}
 		}
-	}
 
-	mRadarList->sortItems();
-	mRadarList->setScrollPos(scroll_pos);
-	if (mSelectedAvatar.notNull())
-	{
-		mRadarList->selectByID(mSelectedAvatar);
+		mRadarList->sortItems();
+		mRadarList->setScrollPos(scroll_pos);
+		if (mSelectedAvatar.notNull())
+		{
+			mRadarList->selectByID(mSelectedAvatar);
+		}
+		avatar_count << (int)avatar_ids.size();
 	}
-
-	// set count
-	std::stringstream avatar_count; 
-	avatar_count.str("");
-	if (avatar_ids.empty())
+	else
 	{
 		mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
 		avatar_count << "0";
 	}
-	else
-	{
-		avatar_count << (int)avatar_ids.size();
-	}
+
 	childSetText("lblAvatarCount", avatar_count.str());
 
 	toggleButtons();
-- 
cgit v1.1


From 23d5c59f6833156ee0714ecfba8194dd8708c730 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 6 Oct 2009 22:12:05 -0700
Subject: Applied RLVa-1.0.2c_20091005_Imprudence-1.2.0-diff.patch

---
 linden/indra/newview/llinventorybridge.cpp |   6 +-
 linden/indra/newview/lltooldraganddrop.cpp |   4 +-
 linden/indra/newview/llviewermenu.cpp      |  12 ++--
 linden/indra/newview/llviewermessage.cpp   |  10 ++-
 linden/indra/newview/rlvhandler.cpp        | 104 ++++++++++-------------------
 linden/indra/newview/rlvhandler.h          |   9 +++
 linden/indra/newview/rlvhelper.cpp         |   9 ++-
 linden/indra/newview/rlvhelper.h           |  78 +++++++++++-----------
 8 files changed, 104 insertions(+), 128 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 618c4f9..0d5625c 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -3505,7 +3505,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 				if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getEnableWear()) && (gRlvHandler.hasLockedAttachment()) )
 				{
 					LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(item, true);
-					if ( (!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt->getObject())) )
+					if ( (!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt)) )
 						disabled_items.push_back(std::string("Object Wear"));
 				}
 // [/RLVa:KB]
@@ -4057,7 +4057,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
 			for (S32 idxObj = obj_item_array.count() - 1; idxObj >= 0; idxObj--)
 			{
 				LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(obj_item_array.get(idxObj).get(), true);
-				if ( ((!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt->getObject()))) )
+				if ( ((!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt))) )
 					obj_item_array.remove(idxObj);
 			}
 			obj_count = obj_item_array.count();
@@ -4245,7 +4245,7 @@ void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove)
 // [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
 				LLViewerJointAttachment* pAttachPt = NULL;
 				if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) || 
-					 (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt->getObject()))) )
+					 (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt))) )
 				{
 					items.put(item);
 				}
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index c99ccbf..178bde6 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -2014,10 +2014,10 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
 		return ACCEPT_NO;
 	}
 
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+// [RLVa:KB] - Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
 	LLViewerJointAttachment* pAttachPt = NULL;
 	if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) &&
-		 ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) || (!gRlvHandler.isDetachable(pAttachPt->getObject())) ) )
+		 ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) || (!gRlvHandler.isDetachable(pAttachPt)) ) )
 	{
 		return ACCEPT_NO_LOCKED;
 	}
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index d11bc02..98dd0ea 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6045,9 +6045,9 @@ private:
 
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
 			if ( (rlv_handler_t::isEnabled()) &&
-				 ( ((index == 0) && (gRlvHandler.hasLockedAttachment())) ||						  // Can't wear on default attach point
-				   ((index > 0) && (!gRlvHandler.isDetachable(attachment_point->getObject()))) || // Can't replace locked attachment
-				   (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) ) )									  // Attach on rezzed object == "Take"
+				 ( ((index == 0) && (gRlvHandler.hasLockedAttachment())) ||			 // Can't wear on default attach point
+				   ((index > 0) && (!gRlvHandler.isDetachable(attachment_point))) || // Can't replace locked attachment
+				   (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) ) )						 // Attach on rezzed object == "Take"
 			{
 				setObjectSelection(NULL); // Clear the selection or it'll get stuck
 				return true;
@@ -6449,9 +6449,9 @@ BOOL object_selected_and_point_valid(void *user_data)
 		//      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / right-click / "Attach >" [user_data == pAttachPt]
 		//      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / Edit menu / "Attach Object" [user_data == pAttachPt]
 		LLViewerJointAttachment* pAttachPt = (LLViewerJointAttachment*)user_data;
-		if  ( ((!pAttachPt) && (gRlvHandler.hasLockedAttachment())) ||					// Don't allow attach to default attach point
-			  ((pAttachPt) && (!gRlvHandler.isDetachable(pAttachPt->getObject()))) ||	// Don't allow replacing of locked attachment
-			  (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )								// Attaching a rezzed object == "Take"
+		if  ( ((!pAttachPt) && (gRlvHandler.hasLockedAttachment())) ||		// Don't allow attach to default attach point
+			  ((pAttachPt) && (!gRlvHandler.isDetachable(pAttachPt))) ||	// Don't allow replacing of locked attachment
+			  (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )					// Attaching a rezzed object == "Take"
 		{
 			return FALSE;
 		}
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index cecef95..33d3d51 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2579,18 +2579,16 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				verb = " " + LLTrans::getString("whisper") + " ";
 				break;
 			case CHAT_TYPE_OWNER:
-// [RLVa:KB] - Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
-				if ( (rlv_handler_t::isEnabled()) && (mesg.length() > 3) && (RLV_CMD_PREFIX == mesg[0]) )
+// [RLVa:KB] - Checked: 2009-08-28 (RLVa-1.0.2a) | Modified: RLVa-1.0.2a
+				if ( (rlv_handler_t::isEnabled()) && (mesg.length() > 3) && (RLV_CMD_PREFIX == mesg[0]) && (CHAT_TYPE_OWNER == chat.mChatType) )
 				{
 					mesg.erase(0, 1);
 					LLStringUtil::toLower(mesg);
 
 					std::string strExecuted, strFailed, strRetained, *pstr;
 
-					typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-					boost::char_separator<char> sep(",", "", boost::drop_empty_tokens);
-					tokenizer tokens(mesg, sep);
-					for (tokenizer::iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+					boost_tokenizer tokens(mesg, boost::char_separator<char>(",", "", boost::drop_empty_tokens));
+					for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
 					{
 						if (LLStartUp::getStartupState() == STATE_STARTED)
 						{
diff --git a/linden/indra/newview/rlvhandler.cpp b/linden/indra/newview/rlvhandler.cpp
index 2915002..987c62a 100644
--- a/linden/indra/newview/rlvhandler.cpp
+++ b/linden/indra/newview/rlvhandler.cpp
@@ -93,7 +93,7 @@ inline bool rlvIsWearingItem(const LLInventoryItem* pItem)
 static bool rlvParseNotifyOption(const std::string& strOption, S32& nChannel, std::string& strFilter)
 {
 	boost_tokenizer tokens(strOption, boost::char_separator<char>(";", "", boost::keep_empty_tokens));
-	boost_tokenizer::iterator itTok = tokens.begin();
+	boost_tokenizer::const_iterator itTok = tokens.begin();
 
 	// Extract and sanity check the first token (required) which is the channel
 	if ( (itTok == tokens.end()) || (!LLStringUtil::convertToS32(*itTok, nChannel)) || (!rlvIsValidChannel(nChannel)) )
@@ -274,7 +274,7 @@ bool RlvHandler::isDetachableExcept(S32 idxAttachPt, LLViewerObject *pObj) const
 	return true;
 }
 
-// Checked: 2009-05-31 (RLVa-0.2.0e) | Modified: RLVa-0.2.0e
+// Checked: 2009-09-06 (RLVa-1.0.2b) | Modified: RLVa-1.0.2b
 bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDetachable)
 {
 	// Sanity check - make sure it's an object we know about
@@ -284,20 +284,12 @@ bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDe
 
 	if (!fDetachable)
 	{
-		// Sanity check - make sure it's not already marked undetachable by this object (NOTE: m_Attachments is a *multimap*, not a map)
-		for (rlv_detach_map_t::const_iterator itAttach = m_Attachments.lower_bound(idxAttachPt), 
-				endAttach = m_Attachments.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
-		{
-			if (itObj->second.m_UUID == itAttach->second)
-				return false;
-		}
-
+		// NOTE: m_Attachments can contain duplicate <idxAttachPt, idRlvObj> pairs (ie @detach:spine=n,detach=n from an attachment on spine)
 		m_Attachments.insert(std::pair<S32, LLUUID>(idxAttachPt, itObj->second.m_UUID));
 		return true;
 	}
 	else
 	{
-		// NOTE: m_Attachments is a *multimap*, not a map
 		for (rlv_detach_map_t::iterator itAttach = m_Attachments.lower_bound(idxAttachPt), 
 				endAttach = m_Attachments.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
 		{
@@ -325,11 +317,11 @@ bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDe
 			LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
 			if (pItem)
 			{
-				if (-1 != pItem->getName().find(RLV_FOLDER_FLAG_NOSTRIP))
+				if (std::string::npos != pItem->getName().find(RLV_FOLDER_FLAG_NOSTRIP))
 					return false;
 
 				LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
-				if ( (pFolder) && (-1 != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP)) )
+				if ( (pFolder) && (std::string::npos != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP)) )
 					return false;
 			}
 		}
@@ -499,7 +491,7 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
 							itCurCmd = itCmd++;		// Point itCmd ahead so it won't get invalidated if/when we erase a command
 
 							const RlvCommand& rlvCmdRem = *itCurCmd;
-							if ( (strFilter.empty()) || (-1 != rlvCmdRem.asString().find(strFilter)) )
+							if ( (strFilter.empty()) || (std::string::npos != rlvCmdRem.asString().find(strFilter)) )
 							{
 								fContinue = (rlvObj.m_Commands.size() > 1); // rlvObj will become invalid once we remove the last command
 								strCmdRem = rlvCmdRem.getBehaviour() + ":" + rlvCmdRem.getOption() + "=y";
@@ -780,22 +772,15 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
 	{
 		case RLV_BHVR_DETACH:				// @detach[:<option>]=y		- Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
 			{
-				S32 idxAttachPt;
+				S32 idxAttachPt = 0;
 				if (strOption.empty())												// @detach=y
 				{
-					// The object may or may not (if it got detached) still exist so clean up the hard way
-					if (m_Objects.find(uuid) != m_Objects.end())
-					{
-						for (rlv_detach_map_t::const_iterator itAttach = m_Attachments.begin(), endAttach = m_Attachments.end();
-							itAttach != endAttach; ++itAttach)
-						{
-							if (itAttach->second == uuid)
-							{
-								setDetachable(itAttach->first, uuid, true); // <- invalidates our iterators on return
-								break;
-							}
-						}
-					}
+					// The object may or may not (if it got detached) still exist
+					rlv_object_map_t::const_iterator itObj = m_Objects.find(uuid);
+					if (itObj != m_Objects.end())
+						idxAttachPt = itObj->second.m_idxAttachPt;
+					if (idxAttachPt)
+						setDetachable(idxAttachPt, uuid, true);
 				}
 				else if ((idxAttachPt = getAttachPointIndex(strOption, true)))		// @detach:<attachpt>=y
 				{
@@ -946,10 +931,8 @@ BOOL RlvHandler::processForceCommand(const LLUUID& idObj, const RlvCommand& rlvC
 				{
 					LLVector3d posGlobal;
 
-					typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-					boost::char_separator<char> sep("/", "", boost::keep_empty_tokens);
-					tokenizer tokens(strOption, sep); int idx = 0;
-					for (tokenizer::iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+					boost_tokenizer tokens(strOption, boost::char_separator<char>("/", "", boost::keep_empty_tokens)); int idx = 0;
+					for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
 					{
 						if (idx < 3)
 							LLStringUtil::convertToF64(*itToken, posGlobal[idx++]);
@@ -1165,7 +1148,7 @@ BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCm
 		case RLV_BHVR_GETINVWORN:		// @getinvworn[:path]=<channel>		  - Checked:
 			onGetInvWorn(rlvCmd.getOption(), strReply);
 			break;
-		case RLV_BHVR_FINDFOLDER:		// @findfolder:<criteria>=<channel>   - Checked: 2009-07-12 (RLVa-1.0.0h)
+		case RLV_BHVR_FINDFOLDER:		// @findfolder:<criteria>=<channel>   - Checked: 2009-08-26 (RLVa-1.0.2a) | Modified: RLVa-1.0.2a
 			{
 				// COMPAT-RLV: RLV 1.16.1 returns the first random folder it finds (probably tries to match "" to a folder name?)
 				//             (just going to stick with what's there for now... no option => no folder)
@@ -1173,7 +1156,8 @@ BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCm
 				if ( (!strOption.empty()) && (findSharedFolders(strOption, folders)) )
 				{
 					// We need to return an "in depth" result so whoever has the most '/' is our lucky winner
-					int maxSlashes = 0, curSlashes; std::string strFolderName;
+					// (maxSlashes needs to be initialized to -1 since children of the #RLV folder won't have '/' in their shared path)
+					int maxSlashes = -1, curSlashes; std::string strFolderName;
 					for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
 					{
 						strFolderName = getSharedPath(folders.get(idxFolder));
@@ -1307,6 +1291,9 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
 	rlv_object_map_t::iterator itObj = m_Objects.find(pObj->getID());
 	if (itObj != m_Objects.end())
 	{
+		// Save the attachment point index
+		itObj->second.m_idxAttachPt = idxAttachPt;
+
 		// If it's an attachment we processed commands for but that only just rezzed in we need to mark it as existing in gObjectList
 		if (!itObj->second.m_fLookup)
 			itObj->second.m_fLookup = true;
@@ -1315,7 +1302,7 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
 		if (itObj->second.hasBehaviour(RLV_BHVR_DETACH))
 		{
 			// (Copy/paste from processAddCommand)
-			setDetachable(pObj, pObj->getID(), false);
+			setDetachable(idxAttachPt, pObj->getID(), false);
 
 			if (pObj->isHUDAttachment())
 				LLPipeline::sShowHUDAttachments = TRUE;	// Prevents hiding of locked HUD attachments
@@ -1365,29 +1352,15 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
 				 (!getAttachPoint(pFolder, true)) )
 			{
 				// It's no mod and its parent folder doesn't contain an attach point
-				LLInventoryModel::cat_array_t*  pFolders;
-				LLInventoryModel::item_array_t* pItems;
-				gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
-
-				if (pItems)
+				if ( (1 == rlvGetDirectDescendentsCount(pFolder, LLAssetType::AT_OBJECT)) && (NEW_CATEGORY_NAME == pFolder->getName()) )
 				{
-					int cntObjects = 0;
-					for (S32 idxItem = 0, cntItem = pItems->size(); idxItem < cntItem; idxItem++)
-					{
-						if (LLAssetType::AT_OBJECT == pItems->get(idxItem)->getType())
-							cntObjects++;
-					}
-
 					// Only rename if there's exactly 1 object/attachment inside of it [see LLFolderBridge::renameItem()]
-					if ( (1 == cntObjects) && (NEW_CATEGORY_NAME == pFolder->getName()) )
-					{
-						std::string strName = ".(" + strAttachPt + ")";
+					std::string strName = ".(" + strAttachPt + ")";
 
-						pFolder->rename(strName);
-						pFolder->updateServer(FALSE);
-						gInventory.updateCategory(pFolder);
-						//gInventory.notifyObservers(); <- done further down in LLVOAvatar::attachObject()
-					}
+					pFolder->rename(strName);
+					pFolder->updateServer(FALSE);
+					gInventory.updateCategory(pFolder);
+					//gInventory.notifyObservers(); <- done further down in LLVOAvatar::attachObject()
 				}
 			}
 		}
@@ -1864,10 +1837,8 @@ LLViewerInventoryCategory* RlvHandler::getSharedFolder(const std::string& strPat
 		return NULL;
 
 	// Walk the path (starting at the root)
-	typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-	boost::char_separator<char> sep("/", "", boost::drop_empty_tokens);
-	tokenizer tokens(strPath, sep);
-	for (tokenizer::iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+	boost_tokenizer tokens(strPath, boost::char_separator<char>("/", "", boost::drop_empty_tokens));
+	for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
 	{
 		pFolder = getSharedFolder(pFolder->getUUID(), *itToken);
 		if (!pFolder)
@@ -2102,15 +2073,10 @@ void RlvHandler::onForceRemOutfit(const LLUUID& idObj, const std::string& strOpt
 	for (int idxType = 0; idxType < WT_COUNT; idxType++)
 	{
 		type = (EWearableType)idxType;
+		if (LLAssetType::AT_CLOTHING != LLWearable::typeToAssetType(type))
+			continue; // Only strip clothing, not bodyparts
 
-		// Only strip clothing (that's currently worn and not marked "nostrip")
-		if ( (LLAssetType::AT_CLOTHING != LLWearable::typeToAssetType(type)) ||	
-			 (!gAgent.getWearable(type)) || (!isStrippable(gAgent.getWearableItem(type))) )
-		{
-			continue;
-		}
-
-		if ( (typeOption == type) || (strOption.empty()) )
+		if ( ((typeOption == type) || (strOption.empty())) && (gAgent.getWearable(type)) && (isStrippable(gAgent.getWearableItem(type))) )
 		{
 			#ifdef RLV_EXPERIMENTAL_COMPOSITES
 				// If we're stripping something that's part of a composite folder then we should @detachthis instead
@@ -2238,7 +2204,7 @@ void RlvHandler::onForceWear(const std::string& strPath, bool fAttach, bool fMat
 								// Simulate wearing an object to a specific attachment point (copy/paste to suppress replacement dialog)
 								// LLAttachObject::handleEvent() => rez_attachment()
 								LLViewerJointAttachment* pAttachPt = getAttachPoint(pItem, true);
-								if ( (pAttachPt) && (isDetachable(pAttachPt->getObject())) )
+								if ( (pAttachPt) && (isDetachable(pAttachPt)) )
 								{
 									#if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)			// Version: 1.22.11
 										LLAttachmentRezAction* rez_action = new LLAttachmentRezAction;
@@ -2498,7 +2464,7 @@ BOOL RlvHandler::setEnabled(BOOL fEnable)
 
 BOOL RlvHandler::canDisable()
 {
-	return TRUE;
+	return FALSE;
 }
 
 void RlvHandler::clearState()
diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h
index df3ff9b..505bfd5 100644
--- a/linden/indra/newview/rlvhandler.h
+++ b/linden/indra/newview/rlvhandler.h
@@ -73,6 +73,7 @@ public:
 	// Returns TRUE if the specified attachment point is detachable
 	bool isDetachable(S32 idxAttachPt) const { return (idxAttachPt) && (m_Attachments.find(idxAttachPt) == m_Attachments.end()); }
 	bool isDetachable(const LLInventoryItem* pItem) const;
+	bool isDetachable(LLViewerJointAttachment* pAttachPt) const;
 	bool isDetachable(LLViewerObject* pObj) const;
 	// Returns TRUE if the specified attachment point is set undetachable by anything other than pObj (or one of its children)
 	bool isDetachableExcept(S32 idxAttachPt, LLViewerObject* pObj) const;
@@ -370,6 +371,14 @@ inline bool RlvHandler::hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUI
 	}
 #endif // RLV_EXPERIMENTAL_COMPOSITES
 
+// Checked: 2009-09-08 (RLVa-1.0.2c) | Added: RLVa-1.0.2c
+inline bool RlvHandler::isDetachable(LLViewerJointAttachment *pAttachPt) const
+{
+	// If there's an attached object it's faster to just use that; otherwise look up the attachment index because it might be locked empty
+	return (pAttachPt == NULL) ||
+		   ( (pAttachPt->getObject() != NULL) && isDetachable(pAttachPt->getObject()) ) || (isDetachable(getAttachPointIndex(pAttachPt)));
+}
+
 // Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
 inline bool RlvHandler::isDetachable(LLViewerObject* pObj) const
 {
diff --git a/linden/indra/newview/rlvhelper.cpp b/linden/indra/newview/rlvhelper.cpp
index 6b2a1a0..429a527 100644
--- a/linden/indra/newview/rlvhelper.cpp
+++ b/linden/indra/newview/rlvhelper.cpp
@@ -409,12 +409,11 @@ bool rlvCanDeleteOrReturn()
 	return fIsAllowed;
 }
 
-// Checked: 2009-07-05 (RLVa-1.0.0c)
+// Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
 BOOL rlvAttachToEnabler(void* pParam)
 {
 	// Enables/disables an option on the "Attach to (HUD)" submenu depending on whether it is (un)detachable
-	LLViewerJointAttachment* pAttachment = (LLViewerJointAttachment*)pParam;
-	return (!pAttachment) || (gRlvHandler.isDetachable(pAttachment->getObject()));
+	return gRlvHandler.isDetachable((LLViewerJointAttachment*)pParam);
 }
 
 BOOL RlvGCTimer::tick()
@@ -672,3 +671,7 @@ std::string rlvGetLastParenthesisedText(const std::string& strText, std::string:
 }
 
 // =========================================================================
+// Debug helper functions
+//
+
+// =========================================================================
diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
index a0e040e..9ceb799 100644
--- a/linden/indra/newview/rlvhelper.h
+++ b/linden/indra/newview/rlvhelper.h
@@ -55,8 +55,8 @@ const S32 RLV_VERSION_PATCH = 0;
 // Implementation version
 const S32 RLVa_VERSION_MAJOR = 1;
 const S32 RLVa_VERSION_MINOR = 0;
-const S32 RLVa_VERSION_PATCH = 1;
-const S32 RLVa_VERSION_BUILD = 7;
+const S32 RLVa_VERSION_PATCH = 2;
+const S32 RLVa_VERSION_BUILD = 2;
 
 // The official viewer version we're patching against
 #define RLV_MAKE_TARGET(x, y, z)	((x << 16) | (y << 8) | z)
@@ -249,7 +249,12 @@ typedef std::list<RlvCommand> rlv_command_list_t;
 class RlvObject
 {
 public:
-	RlvObject(const LLUUID& uuid) : m_UUID(uuid), m_nLookupMisses(0) { m_fLookup = (NULL != gObjectList.findObject(uuid)); }
+	RlvObject(const LLUUID& uuid) : m_UUID(uuid), m_nLookupMisses(0)
+	{
+		LLViewerObject* pObj = gObjectList.findObject(uuid);
+		m_fLookup = (NULL != pObj);
+		m_idxAttachPt = (pObj) ? ATTACHMENT_ID_FROM_STATE(pObj->getState()) : 0;
+	}
 
 	BOOL addCommand(const RlvCommand& rlvCmd);
 	BOOL removeCommand(const RlvCommand& rlvCmd);
@@ -264,6 +269,7 @@ public:
 	const rlv_command_list_t* getCommandList() const { return &m_Commands; }
 protected:
 	LLUUID             m_UUID;				// The object's UUID
+	S32                m_idxAttachPt;		// The object's attachment point (or 0 if it's not an attachment)
 	bool               m_fLookup;			// TRUE if the object existed in gObjectList at one point in time
 	S16                m_nLookupMisses;		// Count of unsuccessful lookups in gObjectList by the GC
 	rlv_command_list_t m_Commands;			// List of behaviours held by this object (in the order they were received)
@@ -284,11 +290,16 @@ class RlvCriteriaCategoryCollector : public LLInventoryCollectFunctor
 public:
 	RlvCriteriaCategoryCollector(const std::string& strCriteria)
 	{
-		typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-		boost::char_separator<char> sep("&&", "", boost::drop_empty_tokens);
-		tokenizer tokens(strCriteria, sep);
-		for (tokenizer::iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
-			m_Criteria.push_back(*itToken);
+		std::string::size_type idxIt, idxLast = 0;
+		while (idxLast < strCriteria.length())
+		{
+			idxIt = strCriteria.find("&&", idxLast);
+			if (std::string::npos == idxIt)
+				idxIt = strCriteria.length();
+			if (idxIt != idxLast)
+				m_Criteria.push_back(strCriteria.substr(idxLast, idxIt - idxLast));
+			idxLast = idxIt + 2;
+		}
 	}
 	virtual ~RlvCriteriaCategoryCollector() {}
 
@@ -304,7 +315,7 @@ public:
 			return false;
 
 		for (std::list<std::string>::const_iterator itCrit = m_Criteria.begin(); itCrit != m_Criteria.end(); ++itCrit)
-			if (-1 == strFolderName.find(*itCrit))	// Return false on the first mismatch
+			if (std::string::npos == strFolderName.find(*itCrit))	// Return false on the first mismatch
 				return false;
 		return true;
 	}
@@ -317,7 +328,7 @@ protected:
 /*
  * RlvWearableItemCollector
  * ========================
- * Inventory item filter used by attach/detach/attachall/detachall/getinvworn (also used by "Add/Replace Outfit" and "Take Off Items")
+ * Inventory item filter used by attach/detach/attachall/detachall/getinvworn
  *
  */
 
@@ -349,11 +360,8 @@ protected:
 };
 
 // ============================================================================
-/*
- * RlvRetainedCommand
- * ==================
- *
- */
+// RlvRetainedCommand
+//
 
 struct RlvRetainedCommand
 {
@@ -369,11 +377,8 @@ private:
 typedef std::list<RlvRetainedCommand> rlv_retained_list_t;
 
 // ============================================================================
-/*
- * RlvWLSnapshot
- * =============
- *
- */
+// RlvWLSnapshot
+//
 
 struct RlvWLSnapshot
 {
@@ -389,11 +394,8 @@ private:
 };
 
 // ============================================================================
-/*
- * RlvSettings
- * ===========
- *
- */
+// RlvSettings
+//
 
 #define RLV_SETTING_MAIN				"RestrainedLife"
 #define RLV_SETTING_DEBUG				"RestrainedLifeDebug"
@@ -437,10 +439,8 @@ public:
 };
 
 // ============================================================================
-/*
- * State keeping classes/structure
- *
- */
+// State keeping classes/structure
+//
 
 struct RlvRedirInfo
 {
@@ -461,10 +461,8 @@ struct RlvReattachInfo
 };
 
 // ============================================================================
-/*
- * Various helper classes/timers/functors
- *
- */
+// Various helper classes/timers/functors
+//
 
 class RlvGCTimer : public LLEventTimer
 {
@@ -504,10 +502,8 @@ struct RlvSelectIsSittingOn : public LLSelectedNodeFunctor
 };
 
 // ============================================================================
-/*
- * Various helper functions
- *
- */
+// Various helper functions
+//
 
 BOOL rlvAttachToEnabler(void* pParam);
 bool rlvCanDeleteOrReturn();
@@ -525,6 +521,10 @@ void rlvStringReplace(std::string& strText, std::string strFrom, const std::stri
 std::string rlvGetFirstParenthesisedText(const std::string& strText, std::string::size_type* pidxMatch = NULL);
 std::string rlvGetLastParenthesisedText(const std::string& strText, std::string::size_type* pidxStart = NULL);
 
+// ============================================================================
+// Debug helper functions
+//
+
 #ifdef RLV_ADVANCED_TOGGLE_RLVA
 	// "Advanced / RLVa / Enable RLV" menu option
 	void rlvDbgToggleEnabled(void*);
@@ -561,10 +561,10 @@ inline bool rlvIsEmote(const std::string& strUTF8Text)
 	return (strUTF8Text.length() > 4) && ( (strUTF8Text.compare(0, 4, "/me ") == 0) || (strUTF8Text.compare(0, 4, "/me'") == 0) );
 }
 
-// Checked: 2009-08-05 (RLVa-1.0.1e) | Added: RLVa-1.0.0e
+// Checked: 2009-09-05 (RLVa-1.0.2a) | Added: RLVa-1.0.2a
 inline bool rlvIsValidChannel(S32 nChannel)
 {
-	return (nChannel >= 0) && (CHAT_CHANNEL_DEBUG != nChannel);
+	return (nChannel > 0) && (CHAT_CHANNEL_DEBUG != nChannel);
 }
 
 // Checked: 2009-08-05 (RLVa-1.0.1e) | Added: RLVa-1.0.0e
-- 
cgit v1.1


From 0bd17be512fbf47600a7971208244e73424429f4 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 6 Oct 2009 22:16:12 -0700
Subject: Applied RLVa-1.0.3e_20091005_Imprudence-1.2.0-diff.patch by Kitty
 Barnett

---
 linden/indra/newview/CMakeLists.txt                |   1 +
 linden/indra/newview/app_settings/settings.xml     |  44 +++
 linden/indra/newview/llfirstuse.cpp                |  37 ++
 linden/indra/newview/llfirstuse.h                  |  17 +
 linden/indra/newview/llviewermenu.cpp              |  38 +--
 linden/indra/newview/llviewermessage.cpp           |   8 +
 linden/indra/newview/rlvevent.h                    |  19 +-
 linden/indra/newview/rlvextensions.cpp             |  31 +-
 linden/indra/newview/rlvhandler.cpp                |  73 ++--
 linden/indra/newview/rlvhandler.h                  |   8 +-
 linden/indra/newview/rlvhelper.cpp                 | 374 ++++++++++-----------
 linden/indra/newview/rlvhelper.h                   | 338 ++++---------------
 .../newview/skins/default/xui/en-us/alerts.xml     |  17 +
 .../skins/default/xui/en-us/menu_viewer.xml        |  40 ++-
 .../newview/skins/default/xui/en-us/notify.xml     |  19 +-
 15 files changed, 529 insertions(+), 535 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index e993564..3db96c4 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -856,6 +856,7 @@ set(viewer_HEADER_FILES
     randgauss.h
     VertexCache.h
     VorbisFramework.h
+    rlvdefines.h
     rlvevent.h
     rlvhandler.h
     rlvhelper.h
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 8a13b85..8ffcb19 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -100,6 +100,50 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>WarnFirstRLVDetach</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables FirstRLVDetach warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>WarnFirstRLVEnableWear</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables RLVEnableWear warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>WarnFirstRLVFartouch</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables FirstRLVFartouch warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</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>AFKTimeout</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index b807b17..7c611a3 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -44,6 +44,10 @@
 #include "llappviewer.h"
 #include "lltracker.h"
 
+// [RLVa:KB] - Version: 1.22.11
+#include "llviewerwindow.h"
+// [/RLVa:KB]
+
 // static
 std::set<std::string> LLFirstUse::sConfigVariables;
 
@@ -287,3 +291,36 @@ void LLFirstUse::useMedia()
 		LLNotifyBox::showXml("FirstMedia");
 	}
 }
+
+// [RLVa:KB] - Version: 1.22.11 | Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
+
+// SL-1.22.11 doesn't seem to have a way to check which notifications are currently open :(
+bool rlvHasVisibleFirstUseNotification()
+{
+	return false;
+}
+
+void LLFirstUse::showRlvFirstUseNotification(const std::string& strName)
+{
+	if ( (gSavedSettings.getWarning(strName)) && (!rlvHasVisibleFirstUseNotification()) )
+	{
+		gSavedSettings.setWarning(strName, FALSE);
+		LLNotifyBox::showXml(strName);
+	}
+}
+
+void LLFirstUse::warnRlvGiveToRLV()
+{
+	if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) )
+		gViewerWindow->alertXml(RLV_SETTING_FIRSTUSE_GIVETORLV, LLStringUtil::format_map_t(), &LLFirstUse::onRlvGiveToRLVConfirmation, NULL);
+}
+
+void LLFirstUse::onRlvGiveToRLVConfirmation(S32 idxOption, void* /*pUserParam*/)
+{
+	gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE);
+
+	if ( (0 == idxOption) || (1 == idxOption) )
+		gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1));
+}
+
+// [/RLVa:KB]
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index cbb31ab..7460067 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -35,6 +35,10 @@
 #include <vector>
 #include "llstring.h"
 
+// [RLVa:KB]
+#include "rlvdefines.h"
+// [/RLVa:KB]
+
 /*
 1.  On first use of 'sit here', explain how to get up and rotate view. 
 
@@ -109,6 +113,19 @@ public:
 	
 protected:
 	static std::set<std::string> sConfigVariables;
+
+// [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
+public:
+	static void showRlvFirstUseNotification(const std::string& strName);
+
+	static void useRlvDetach()		{ showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_DETACH); }
+	static void useRlvEnableWear()	{ showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_ENABLEWEAR); }
+	static void useRlvFartouch()	{ showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_FARTOUCH); }
+
+	static void warnRlvGiveToRLV();
+protected:
+	static void onRlvGiveToRLVConfirmation(S32 idxOption, void* pUserParam);
+// [/RLVa:KB]
 };
 
 #endif
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 98dd0ea..55cc2a6 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -953,7 +953,7 @@ void init_client_menu(LLMenuGL* menu)
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-1.0.0e
 	#ifdef RLV_ADVANCED_TOGGLE_RLVA
 		if (gSavedSettings.controlExists(RLV_SETTING_MAIN))
-			menu->append(new LLMenuItemCheckGL("Restrained Life API", &rlvDbgToggleEnabled, NULL, &rlvDbgGetEnabled, NULL));
+			menu->append(new LLMenuItemCheckGL("Restrained Life API", &rlvToggleEnabled, NULL, &rlvGetEnabled, NULL));
 	#endif // RLV_ADVANCED_TOGGLE_RLVA
 // [/RLVa:KB]
 
@@ -1407,30 +1407,24 @@ void init_debug_baked_texture_menu(LLMenuGL* menu)
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
 void init_debug_rlva_menu(LLMenuGL* menu)
 {
-	// Experimental feature toggles
+	// Debug options
 	{
-		/*
-		#ifdef RLV_EXPERIMENTAL
-			LLMenuGL* sub_menu = new LLMenuGL("Experimental");
+		LLMenuGL* pDbgMenu = new LLMenuGL("Debug");
 
-			menu->appendMenu(sub_menu);
-		#endif // RLV_EXPERIMENTAL
-		*/
-	}
+		if (gSavedSettings.controlExists(RLV_SETTING_DEBUG))
+			pDbgMenu->append(new LLMenuItemCheckGL("Show Debug Messages", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_DEBUG));
+		pDbgMenu->appendSeparator();
+		if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+			pDbgMenu->append(new LLMenuItemCheckGL("Enable Legacy Naming", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_ENABLELEGACYNAMING));
 
-	// Unit tests
-	{
-		#ifdef RLV_DEBUG_TESTS
-			init_debug_rlva_tests_menu(menu);
-		#endif // RLV_DEBUG_TESTS
+		menu->appendMenu(pDbgMenu);
+		menu->appendSeparator();
 	}
 
 	#ifdef RLV_EXTENSION_ENABLE_WEAR
 		if (gSavedSettings.controlExists(RLV_SETTING_ENABLEWEAR))
-		{
 			menu->append(new LLMenuItemCheckGL("Enable Wear", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_ENABLEWEAR));
-			menu->appendSeparator();
-		}
+		menu->appendSeparator();
 	#endif // RLV_EXTENSION_ENABLE_WEAR
 
 	#ifdef RLV_EXTENSION_HIDELOCKED
@@ -1444,6 +1438,12 @@ void init_debug_rlva_menu(LLMenuGL* menu)
 		}
 	#endif // RLV_EXTENSION_HIDELOCKED
 
+	if (gSavedSettings.controlExists(RLV_SETTING_FORBIDGIVETORLV))
+		menu->append(new LLMenuItemCheckGL("Forbid Give to #RLV", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_FORBIDGIVETORLV));
+	if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+		menu->append(new LLMenuItemCheckGL("Show Name Tags", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_SHOWNAMETAGS));
+	menu->appendSeparator();
+
 	#ifdef RLV_EXTENSION_FLOATER_RESTRICTIONS
 		// TODO-RLVa: figure out a way to tell if floater_rlv_behaviour.xml exists
 		menu->append(new LLMenuItemCallGL("Restrictions...", RlvFloaterBehaviour::show, NULL, NULL));
@@ -10376,7 +10376,7 @@ class RLVaMainToggle : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		rlvDbgToggleEnabled(NULL);
+		rlvToggleEnabled(NULL);
 		return true;
 	}
 };
@@ -10385,7 +10385,7 @@ class RLVaMainCheck : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		bool new_value = rlvDbgGetEnabled(NULL);
+		bool new_value = rlvGetEnabled(NULL);
 		std::string control_name = userdata["control"].asString();
 		gMenuHolder->findControl(control_name)->setValue(new_value);
 		return true;
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 33d3d51..464d687 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1821,6 +1821,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			}
 			else
 			{
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-09-10 (RLVa-1.0.3a)
+				if ( (rlv_handler_t::isEnabled()) && (dialog == IM_TASK_INVENTORY_OFFERED) &&
+					 (info->mDesc.find(RLV_PUTINV_PREFIX) == 1) && (gRlvHandler.getSharedRoot()) )
+				{
+					LLFirstUse::warnRlvGiveToRLV();
+				}
+// [/RLVa:KB]
+
 				inventory_offer_handler(info, dialog == IM_TASK_INVENTORY_OFFERED);
 			}
 		}
diff --git a/linden/indra/newview/rlvevent.h b/linden/indra/newview/rlvevent.h
index c3d9c45..a98996f 100644
--- a/linden/indra/newview/rlvevent.h
+++ b/linden/indra/newview/rlvevent.h
@@ -10,11 +10,8 @@
 #include "rlvhelper.h"
 
 // ============================================================================
-/*
- * RlvEvent
- * ========
- * Passed to observer event handlers (contains the same paramaters as RlvHandler::processXXXCommand)
- */
+// RlvEvent - Passed to observer event handlers (contains the same paramaters as RlvHandler::processXXXCommand)
+//
 
 class RlvEvent
 {
@@ -63,6 +60,7 @@ public:
 
 	virtual BOOL onAddCommand(const EventType& rlvEvent)    { return FALSE; }
 	virtual BOOL onRemoveCommand(const EventType& rlvEvent) { return FALSE; }
+	virtual BOOL onClearCommand(const EventType& rlvEvent)  { return FALSE; }
 	virtual BOOL onReplyCommand(const EventType& rlvEvent)  { return FALSE; }
 	virtual BOOL onForceCommand(const EventType& rlvEvent)  { return FALSE; }
 };
@@ -168,11 +166,16 @@ public:
 
 	void changed(const RlvCommand& rlvCmd, bool fInternal)
 	{
-		if ( (fInternal) || ((RLV_TYPE_ADD != rlvCmd.getParamType()) && (RLV_TYPE_REMOVE != rlvCmd.getParamType())) )
+		if (fInternal)
 			return;
 
-		std::string strCmd = rlvCmd.asString();
-		std::string strNotify = llformat("/%s=%c", strCmd.c_str(), (RLV_TYPE_ADD == rlvCmd.getParamType()) ? 'n' : 'y');
+		std::string strCmd = rlvCmd.asString(), strNotify; ERlvParamType eCmdType = rlvCmd.getParamType();
+		if ( (RLV_TYPE_ADD == eCmdType) || (RLV_TYPE_REMOVE == eCmdType) )
+			strNotify = llformat("/%s=%s", strCmd.c_str(), rlvCmd.getParam().c_str());
+		else if (RLV_TYPE_CLEAR == eCmdType)
+			strNotify = llformat("/%s", strCmd.c_str());
+		else
+			return;
 
 		for (std::multimap<LLUUID, notifyData>::const_iterator itNotify = m_Notifications.begin(); 
 				itNotify != m_Notifications.end(); ++itNotify)
diff --git a/linden/indra/newview/rlvextensions.cpp b/linden/indra/newview/rlvextensions.cpp
index 6f79636..10d1c46 100644
--- a/linden/indra/newview/rlvextensions.cpp
+++ b/linden/indra/newview/rlvextensions.cpp
@@ -1,5 +1,6 @@
 #include "llviewerprecompiledheaders.h"
 #include "llagent.h"
+#include "llfloaterwindlight.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
@@ -221,8 +222,18 @@ void RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValu
 	}
 }
 
+// Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
 std::string RlvExtGetSet::onGetEnv(std::string strSetting)
 {
+	// HACK: - create a LLFloaterWindLight instance if there isn't one already
+	//       - isOpen() is actually instanceExists()
+	//       - creating an instance results in showing the floater which is why we need to ->close() it
+	if (!LLFloaterWindLight::isOpen())
+	{
+		LLFloaterWindLight::instance()->close();
+		LLFloaterWindLight::instance()->syncMenu();
+	}
+
 	LLWLParamManager* pWLParams = LLWLParamManager::instance();
 
 	F32 nValue = 0.0f;
@@ -238,7 +249,7 @@ std::string RlvExtGetSet::onGetEnv(std::string strSetting)
 	else if ("cloudscale" == strSetting)			nValue = pWLParams->mCloudScale;
 	else if ("cloudscrollx" == strSetting)			nValue = pWLParams->mCurParams.getCloudScrollX() - 10.0f;
 	else if ("cloudscrolly" == strSetting)			nValue = pWLParams->mCurParams.getCloudScrollY() - 10.0f;
-	else if ("densitymultiplier" == strSetting)		nValue = pWLParams->mDensityMult * 1000;
+	else if ("densitymultiplier" == strSetting)		nValue = pWLParams->mDensityMult.x * pWLParams->mDensityMult.mult;
 	else if ("distancemultiplier" == strSetting)	nValue = pWLParams->mDistanceMult;
 	else if ("eastangle" == strSetting)				nValue = pWLParams->mCurParams.getEastAngle() / F_TWO_PI;
 	else if ("hazedensity" == strSetting)			nValue = pWLParams->mHazeDensity.r;
@@ -260,7 +271,7 @@ std::string RlvExtGetSet::onGetEnv(std::string strSetting)
 		if ( ('r' == ch) || ('g' == ch) || ('b' == ch) || ('i' == ch) )
 		{
 			WLColorControl* pColour = NULL;
-			strSetting.erase(strSetting.length() - 2, 1);
+			strSetting.erase(strSetting.length() - 1, 1);
 			
 			if ("ambient" == strSetting)			pColour = &pWLParams->mAmbient;
 			else if ("bluedensity" == strSetting)	pColour = &pWLParams->mBlueDensity;
@@ -272,10 +283,10 @@ std::string RlvExtGetSet::onGetEnv(std::string strSetting)
 
 			if (pColour)
 			{
-				if ('r' == ch)		nValue = pColour->b;
-				else if ('g' == ch)	nValue = pColour->b;
+				if ('r' == ch)		nValue = pColour->r;
+				else if ('g' == ch)	nValue = pColour->g;
 				else if ('b' == ch)	nValue = pColour->b;
-				else if (('i' == ch) && (pColour->hasSliderName)) nValue = pColour->i;
+				else if (('i' == ch) && (pColour->hasSliderName)) nValue = llmax(pColour->r, pColour->g, pColour->b);
 
 				if (pColour->isBlueHorizonOrDensity)	nValue /= 2.0f;
 				else if (pColour->isSunOrAmbientColor)	nValue /= 3.0f;
@@ -286,8 +297,16 @@ std::string RlvExtGetSet::onGetEnv(std::string strSetting)
 	return llformat("%f", nValue);
 }
 
+// Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
 void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
 {
+	// HACK: see RlvExtGetSet::onGetEnv
+	if (!LLFloaterWindLight::isOpen())
+	{
+		LLFloaterWindLight::instance()->close();
+		LLFloaterWindLight::instance()->syncMenu();
+	}
+
 	LLWLParamManager* pWLParams = LLWLParamManager::instance();
 	WLFloatControl* pFloat = NULL;
 	WLColorControl* pColour = NULL;
@@ -405,7 +424,7 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
 
 	if ( ('r' == ch) || ('g' == ch) || ('b' == ch) || ('i' == ch) )
 	{
-		strSetting.erase(strSetting.length() - 2, 1);
+		strSetting.erase(strSetting.length() - 1, 1);
 		
 		if ("ambient" == strSetting)			pColour = &pWLParams->mAmbient;
 		else if ("bluedensity" == strSetting)	pColour = &pWLParams->mBlueDensity;
diff --git a/linden/indra/newview/rlvhandler.cpp b/linden/indra/newview/rlvhandler.cpp
index 987c62a..6044aa9 100644
--- a/linden/indra/newview/rlvhandler.cpp
+++ b/linden/indra/newview/rlvhandler.cpp
@@ -1,6 +1,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llagent.h"
 #include "lldrawpoolalpha.h"
+#include "llfirstuse.h"
 #include "llfloaterbeacons.h"
 #include "llfloaterchat.h"
 #include "llfloaterdaycycle.h"
@@ -96,7 +97,7 @@ static bool rlvParseNotifyOption(const std::string& strOption, S32& nChannel, st
 	boost_tokenizer::const_iterator itTok = tokens.begin();
 
 	// Extract and sanity check the first token (required) which is the channel
-	if ( (itTok == tokens.end()) || (!LLStringUtil::convertToS32(*itTok, nChannel)) || (!rlvIsValidChannel(nChannel)) )
+	if ( (itTok == tokens.end()) || (!LLStringUtil::convertToS32(*itTok, nChannel)) || (!rlvIsValidReplyChannel(nChannel)) )
 		return false;
 
 	// Second token (optional) is the filter
@@ -284,6 +285,10 @@ bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDe
 
 	if (!fDetachable)
 	{
+		#ifdef RLV_EXPERIMENTAL_FIRSTUSE
+			LLFirstUse::useRlvDetach();
+		#endif // RLV_EXPERIMENTAL_FIRSTUSE
+
 		// NOTE: m_Attachments can contain duplicate <idxAttachPt, idRlvObj> pairs (ie @detach:spine=n,detach=n from an attachment on spine)
 		m_Attachments.insert(std::pair<S32, LLUUID>(idxAttachPt, itObj->second.m_UUID));
 		return true;
@@ -469,6 +474,10 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
 				}
 			}
 			break;
+		case RLV_TYPE_CLEAR:
+			fRet = processClearCommand(uuid, rlvCmd);
+			notifyBehaviourObservers(rlvCmd, !fFromObj);
+			break;
 		case RLV_TYPE_FORCE:		// Checked:
 			fRet = processForceCommand(uuid, rlvCmd);
 			break;
@@ -476,32 +485,6 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
 			fRet = processReplyCommand(uuid, rlvCmd);
 			break;
 		case RLV_TYPE_UNKNOWN:		// Checked:
-			{
-				if ("clear" == rlvCmd.getBehaviour())
-				{
-					const std::string& strFilter = rlvCmd.getParam(); std::string strCmdRem;
-
-					rlv_object_map_t::const_iterator itObj = m_Objects.find(uuid);
-					if (itObj != m_Objects.end())	// No sense in @clear'ing if we don't have any commands for this object
-					{
-						const RlvObject& rlvObj = itObj->second; bool fContinue = true;
-						for (rlv_command_list_t::const_iterator itCmd = rlvObj.m_Commands.begin(), itCurCmd; 
-								((fContinue) && (itCmd != rlvObj.m_Commands.end())); )
-						{
-							itCurCmd = itCmd++;		// Point itCmd ahead so it won't get invalidated if/when we erase a command
-
-							const RlvCommand& rlvCmdRem = *itCurCmd;
-							if ( (strFilter.empty()) || (std::string::npos != rlvCmdRem.asString().find(strFilter)) )
-							{
-								fContinue = (rlvObj.m_Commands.size() > 1); // rlvObj will become invalid once we remove the last command
-								strCmdRem = rlvCmdRem.getBehaviour() + ":" + rlvCmdRem.getOption() + "=y";
-								processCommand(uuid, strCmdRem, false);
-							}
-						}
-						fRet = TRUE;
-					}
-				}
-			}
 			break;
 		#ifdef LL_GNUC
 		default:
@@ -663,6 +646,13 @@ BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
 				LLFloaterChat::getInstance()->childSetVisible("active_speakers_panel", false);
 			}
 			break;
+		case RLV_BHVR_FARTOUCH:
+			{
+				#ifdef RLV_EXPERIMENTAL_FIRSTUSE
+					LLFirstUse::useRlvFartouch();
+				#endif // RLV_EXPERIMENTAL_FIRSTUSE
+			}
+			break;
 		case RLV_BHVR_FLY:					// @fly=n					- Checked: 2009-07-05 (RLVa-1.0.0c)
 			{
 				// If currently flying, simulate clicking the Fly button [see LLToolBar::onClickFly()]
@@ -900,6 +890,35 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
 	return TRUE; // Remove commands don't fail, doesn't matter what we return here
 }
 
+BOOL RlvHandler::processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
+{
+	const std::string& strFilter = rlvCmd.getParam(); std::string strCmdRem;
+
+	rlv_object_map_t::const_iterator itObj = m_Objects.find(idObj);
+	if (itObj != m_Objects.end())	// No sense in clearing if we don't have any commands for this object
+	{
+		const RlvObject& rlvObj = itObj->second; bool fContinue = true;
+		for (rlv_command_list_t::const_iterator itCmd = rlvObj.m_Commands.begin(), itCurCmd;
+				((fContinue) && (itCmd != rlvObj.m_Commands.end())); )
+		{
+			itCurCmd = itCmd++;		// Point itCmd ahead so it won't get invalidated if/when we erase a command
+
+			const RlvCommand& rlvCmdRem = *itCurCmd; strCmdRem = rlvCmdRem.asString();
+			if ( (strFilter.empty()) || (std::string::npos != strCmdRem.find(strFilter)) )
+			{
+				fContinue = (rlvObj.m_Commands.size() > 1); // rlvObj will become invalid once we remove the last command
+				processCommand(idObj, strCmdRem.append("=y"), false);
+			}
+		}
+	}
+
+	// Let our observers know about clear commands
+	RlvEvent rlvEvent(idObj, rlvCmd);
+	m_Emitter.update(&RlvObserver::onClearCommand, rlvEvent);
+
+	return TRUE; // Don't fail clear commands even if the object didn't exist since it confuses people
+}
+
 BOOL RlvHandler::processForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd) const
 {
 	const std::string& strOption = rlvCmd.getOption();
diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h
index 505bfd5..4470632 100644
--- a/linden/indra/newview/rlvhandler.h
+++ b/linden/indra/newview/rlvhandler.h
@@ -14,17 +14,11 @@
 #include "rlvmultistringsearch.h"
 
 // ============================================================================
-/*
- * RlvHandler
- * ==========
- *
- */
 
 typedef std::map<LLUUID, RlvObject> rlv_object_map_t;
 typedef std::multimap<S32, LLUUID> rlv_detach_map_t;
 typedef std::map<S32, LLUUID> rlv_reattach_map_t;
 typedef std::multimap<LLUUID, ERlvBehaviour> rlv_exception_map_t;
-typedef std::map<S32, RlvRedirInfo> rlv_redir_map_t;
 
 class RlvHandler
 {
@@ -195,6 +189,7 @@ public:
 protected:
 	BOOL processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd);
 	BOOL processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvCmd);
+	BOOL processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd);
 	BOOL processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
 	BOOL processForceCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
 
@@ -235,7 +230,6 @@ protected:
 	rlv_retained_list_t  m_Retained;
 	rlv_reattach_map_t   m_AttachPending;
 	rlv_reattach_map_t   m_DetachPending;
-	rlv_redir_map_t      m_Redirections;
 	RlvGCTimer*          m_pGCTimer;
 	RlvWLSnapshot*       m_pWLSnapshot;
 
diff --git a/linden/indra/newview/rlvhelper.cpp b/linden/indra/newview/rlvhelper.cpp
index 429a527..f495384 100644
--- a/linden/indra/newview/rlvhelper.cpp
+++ b/linden/indra/newview/rlvhelper.cpp
@@ -1,5 +1,6 @@
 #include "llviewerprecompiledheaders.h"
 #include "llagent.h"
+#include "llfloaterwindlight.h"
 #include "llviewerobject.h"
 #include "llviewerstats.h"
 #include "llviewerwindow.h"
@@ -14,31 +15,33 @@
 // Static variable initialization
 //
 
-RlvMultiStringSearch RlvCommand::m_BhvrLookup;
+RlvCommand::RlvBhvrTable RlvCommand::m_BhvrMap;
 
 // ============================================================================
+// RlvCommmand
+//
 
-// Checked:
+// Checked: 2009-09-10 (RLVa-1.0.3a) | Modified: RLVa-1.0.3a
 RlvCommand::RlvCommand(const std::string& strCommand)
 	: m_eBehaviour(RLV_BHVR_UNKNOWN), m_eParamType(RLV_TYPE_UNKNOWN)
 {
 	if ((m_fValid = parseCommand(strCommand, m_strBehaviour, m_strOption, m_strParam)))
 	{
+		S32 nTemp = 0;
 		if ( ("n" == m_strParam) || ("add" == m_strParam) )
 			m_eParamType = RLV_TYPE_ADD;
 		else if ( ("y" == m_strParam) || ("rem" == m_strParam) )
 			m_eParamType = RLV_TYPE_REMOVE;
 		else if ("force" == m_strParam)
 			m_eParamType = RLV_TYPE_FORCE;
+		else if (LLStringUtil::convertToS32(m_strParam, nTemp))	// Assume it's a reply command if we can convert <param> to an S32
+			m_eParamType = RLV_TYPE_REPLY;
+		else if (m_strBehaviour == "clear")						// clear is the odd one out so just make it its own type
+			m_eParamType = RLV_TYPE_CLEAR;
 		else
 		{
-			m_eParamType = RLV_TYPE_REPLY; // Assume it's a reply command until we encounter a non-digit
-
-			if ( (m_strParam.empty()) || (-1 != m_strParam.find_first_not_of("0123456789")) )
-			{
-				m_eParamType = RLV_TYPE_UNKNOWN;
-				m_fValid = ("clear" == m_strBehaviour);
-			}
+			m_eParamType = RLV_TYPE_UNKNOWN;
+			m_fValid = false;
 		}
 	}
 
@@ -48,50 +51,16 @@ RlvCommand::RlvCommand(const std::string& strCommand)
 		return;
 	}
 
-	U16 nBehaviour;
-	if (m_BhvrLookup.getExactMatchParam(m_strBehaviour, nBehaviour))
-	{
-		m_eBehaviour = (ERlvBehaviour)nBehaviour;
-	}
+	RlvBhvrTable::const_iterator itBhvr = m_BhvrMap.find(m_strBehaviour);
+	if (itBhvr != m_BhvrMap.end())
+		m_eBehaviour = itBhvr->second;
 }
 
-RlvCommand::RlvCommand(const RlvCommand& rlvCmd)
-	: m_fValid(rlvCmd.m_fValid),
-	  m_strBehaviour(rlvCmd.m_strBehaviour), m_eBehaviour(rlvCmd.m_eBehaviour),	
-	  m_strOption(rlvCmd.m_strOption),
-	  m_strParam(rlvCmd.m_strParam), m_eParamType(rlvCmd.m_eParamType)
-{
-}
 
-// ============================================================================
-
-/*
- * ------------------------------
- * Command           | RLV | RLVa
- * ------------------------------
- * :                 |  F  |  F  (missing behaviour)
- * :option           |  F  |  F  (missing behaviour)
- * :=                |  T  |  F  (missing behaviour)
- * :option=          |  T  |  F  (missing behaviour)
- * :option=param     |  T  |  F  (missing behaviour)
- * =                 |  T  |  F  (missing behaviour)
- * =param            |  T  |  F  (missing behaviour)
- * cmd               |  F  |  F  (missing param) [T if <behaviour> == "clear"]
- * cmd:              |  F  |  F  (missing param)
- * cmd:option        |  F  |  F  (missing param)
- * cmd:=             |  T  |  F  (missing param) [1]
- * cmd:option=       |  T  |  F  (missing param) [1]
- * cmd=              |  T  |  F  (missing param) [1]
- * cmd:option=param  |  T  |  T
- * cmd=param         |  T  |  T
- * cmd:=param        |  T  |  T
- *
- * [1] 'clear:=', 'clear:option=' and 'clear=' are "valid" variations of 'clear'
- */
-
-BOOL RlvCommand::parseCommand(/*[in]*/ const std::string& strCommand,  
-	/*[out]*/ std::string& strBehaviour, /*[out]*/ std::string& strOption, /*[out]*/ std::string& strParam)
+bool RlvCommand::parseCommand(const std::string& strCommand, std::string& strBehaviour, std::string& strOption, std::string& strParam)
 {
+	// (See behaviour notes for the command parsing truth table)
+
 	// Format: <behaviour>[:<option>]=<param>
 	int idxParam  = strCommand.find('=');
 	int idxOption = (idxParam > 0) ? strCommand.find(':') : -1;
@@ -100,7 +69,7 @@ BOOL RlvCommand::parseCommand(/*[in]*/ const std::string& strCommand,
 
 	// If <behaviour> is missing it's always an improperly formatted command
 	if ( (0 == idxOption) || (0 == idxParam) )
-		return FALSE;
+		return false;
 
 	strBehaviour = strCommand.substr(0, (-1 != idxOption) ? idxOption : idxParam);
 	strOption = strParam = "";
@@ -111,15 +80,15 @@ BOOL RlvCommand::parseCommand(/*[in]*/ const std::string& strCommand,
 		// Unless "<behaviour> == "clear" AND (idxOption == 0)" 
 		// OR <behaviour> == "clear" AND (idxParam != 0) [see table above]
 		if ( ("clear" == strBehaviour) && ( (!idxOption) || (idxParam) ) )
-			return TRUE;
-		return FALSE;
+			return true;
+		return false;
 	}
 
 	if ( (-1 != idxOption) && (idxOption + 1 != idxParam) )
 		strOption = strCommand.substr(idxOption + 1, idxParam - idxOption - 1);
 	strParam = strCommand.substr(idxParam + 1);
 
-	return TRUE;
+	return true;
 }
 
 void RlvCommand::initLookupTable()
@@ -127,57 +96,61 @@ void RlvCommand::initLookupTable()
 	static bool fInitialized = false;
 	if (!fInitialized)
 	{
-		// NOTE: keep this match with the enumeration at all times
+		// NOTE: keep this matched with the enumeration at all times
 		std::string arBehaviours[RLV_BHVR_COUNT] =
 			{
-				"version", "detach", "redirchat", "rediremote", "sendim", "recvchat", "recvemote", "recvim", "tploc", "tplure", 
-				"sittp", "edit", "rez", "addoutfit", "remoutfit", "getoutfit", "getattach", "showinv", "unsit", "sit",
-				"getstatus", "getstatusall", "getinv", "getinvworn", "findfolder", "findfolders", "attach", "attachall", "detachall",
-				"getpath", "attachthis", "attachallthis", "detachthis", "detachallthis", "fartouch", "showworldmap", "showminimap",
-				"showloc", "tpto", "accepttp", "shownames", "fly", "getsitid", "setdebug", "setenv", "detachme", 
-				"showhovertextall", "showhovertextworld", "showhovertexthud", "showhovertext", "notify"
+				"version", "detach", "sendchat", "emote", "chatshout", "chatnormal", "chatwhisper", "redirchat", "rediremote",
+				"sendim", "recvchat", "recvemote", "recvim", "tplm", "tploc", "tplure", "sittp", "edit", "rez", "addoutfit",
+				"remoutfit", "getoutfit", "getattach", "showinv", "viewnote", "unsit", "sit", "sendchannel", "getstatus", "getstatusall",
+				"getinv", "getinvworn", "findfolder", "findfolders", "attach", "attachall", "detachall", "getpath", "attachthis",
+				"attachallthis", "detachthis", "detachallthis", "fartouch", "showworldmap", "showminimap", "showloc", "tpto", "accepttp",
+				"shownames", "fly", "getsitid", "setdebug", "setenv", "detachme", "showhovertextall", "showhovertextworld",
+				"showhovertexthud", "showhovertext", "notify"
 			};
 
 		for (int idxBvhr = 0; idxBvhr < RLV_BHVR_COUNT; idxBvhr++)
-			m_BhvrLookup.addKeyword(arBehaviours[idxBvhr], idxBvhr);
+			m_BhvrMap.insert(std::pair<std::string, ERlvBehaviour>(arBehaviours[idxBvhr], (ERlvBehaviour)idxBvhr));
 
 		fInitialized = true;
 	}
 }
 
-// Checked: 2009-06-07 (RLVa-0.2.1c)
-std::string RlvCommand::asString() const
+// =========================================================================
+// RlvObject
+//
+
+RlvObject::RlvObject(const LLUUID& idObj) : m_UUID(idObj), m_nLookupMisses(0)
 {
-	return (!m_strOption.empty()) ? (std::string(m_strBehaviour)).append(":").append(m_strOption) : (std::string(m_strBehaviour));
+	LLViewerObject* pObj = gObjectList.findObject(idObj);
+	m_fLookup = (NULL != pObj);
+	m_idxAttachPt = (pObj) ? ATTACHMENT_ID_FROM_STATE(pObj->getState()) : 0;
 }
 
-// =========================================================================
-
-BOOL RlvObject::addCommand(const RlvCommand& rlvCmd)
+bool RlvObject::addCommand(const RlvCommand& rlvCmd)
 {
 	// Sanity checking
 	if (RLV_TYPE_ADD != rlvCmd.getParamType())
-		return FALSE;
+		return false;
 
 	// Don't add duplicate commands for this object (ie @detach=n followed by another @detach=n later on)
-	BOOL fDuplicate = 
+	bool fDuplicate =
 		(RLV_BHVR_UNKNOWN != rlvCmd.getBehaviourType())
 			? hasBehaviour(rlvCmd.getBehaviourType(), rlvCmd.getOption())
 			: hasBehaviour(rlvCmd.getBehaviour(), rlvCmd.getOption());
 	if (fDuplicate)
-		return FALSE;
+		return false;
 
 	// Now that we know it's not a duplicate, add it to the end of the list
 	m_Commands.push_back(rlvCmd);
 
-	return TRUE;
+	return true;
 }
 
-BOOL RlvObject::removeCommand(const RlvCommand& rlvCmd)
+bool RlvObject::removeCommand(const RlvCommand& rlvCmd)
 {
 	// Sanity checking
 	if (RLV_TYPE_REMOVE != rlvCmd.getParamType())
-		return FALSE;
+		return false;
 
 	for (rlv_command_list_t::iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
 	{
@@ -185,42 +158,42 @@ BOOL RlvObject::removeCommand(const RlvCommand& rlvCmd)
 		if ( (itCmd->getBehaviour() == rlvCmd.getBehaviour()) && (itCmd->getOption() == rlvCmd.getOption()) )
 		{
 			m_Commands.erase(itCmd);
-			return TRUE;
+			return true;
 		}
 	}
-	return FALSE;	// Command was never added so nothing to remove now
+	return false;	// Command was never added so nothing to remove now
 }
 
-BOOL RlvObject::hasBehaviour(ERlvBehaviour eBehaviour) const
+bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour) const
 {
 	for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
 		if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption().empty()) )
-			return TRUE;
-	return FALSE;
+			return true;
+	return false;
 }
 
-BOOL RlvObject::hasBehaviour(const std::string& strBehaviour) const
+bool RlvObject::hasBehaviour(const std::string& strBehaviour) const
 {
 	for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
 		if ( (itCmd->getBehaviour() == strBehaviour) && (itCmd->getOption().empty()) )
-			return TRUE;
-	return FALSE;
+			return true;
+	return false;
 }
 
-BOOL RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const
+bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const
 {
 	for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
 		if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption() == strOption) )
-			return TRUE;
-	return FALSE;
+			return true;
+	return false;
 }
 
-BOOL RlvObject::hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const
+bool RlvObject::hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const
 {
 	for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
 		if ( (itCmd->getBehaviour() == strBehaviour) && (itCmd->getOption() == strOption) )
-			return TRUE;
-	return FALSE;
+			return true;
+	return false;
 }
 
 // Checked: 2009-06-07 (RLVa-0.2.1c)
@@ -242,31 +215,9 @@ std::string RlvObject::getStatusString(const std::string& strMatch) const
 	return strStatus;
 }
 
-// =========================================================================
-/*
- * Various helper classes/timers/functors
- *
- */
-
-// Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
-S32 rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type)
-{
-	S32 cntType = 0;
-	if (pFolder)
-	{
-		LLInventoryModel::cat_array_t*  pFolders;
-		LLInventoryModel::item_array_t* pItems;
-		gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
-
-		if (pItems)
-		{
-			for (S32 idxItem = 0, cntItem = pItems->count(); idxItem < cntItem; idxItem++)
-				if (pItems->get(idxItem)->getType() == type)
-					cntType++;
-		}
-	}
-	return cntType;
-}
+// ============================================================================
+// RlvWearableItemCollector
+//
 
 // Checked: 2009-05-30 (RLVa-0.2.0e) | Added: RLVa-0.2.0e
 const LLUUID& RlvWearableItemCollector::getFoldedParent(const LLUUID& idFolder) const
@@ -365,56 +316,72 @@ bool RlvWearableItemCollector::operator()(LLInventoryCategory* pFolder, LLInvent
 	return (pFolder) ? onCollectFolder(pFolder) : ( (pItem) ? onCollectItem(pItem) : false );
 }
 
-// Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0f
-bool RlvSelectHasLockedAttach::apply(LLSelectNode* pNode)
-{
-	return (pNode->getObject()) ? !gRlvHandler.isDetachable(pNode->getObject()) : false;
-}
-
-// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0f
-bool RlvSelectIsOwnedByOrGroupOwned::apply(LLSelectNode* pNode)
-{
-	return (pNode->mPermissions->isGroupOwned()) || (pNode->mPermissions->getOwner() == m_idAgent);
-}
+// ============================================================================
+// RlvWLSnapshot
+//
 
-// Checked: 2009-05-31 (RLVa-0.2.0f) | Modified: RLVa-0.2.0f
-bool RlvSelectIsSittingOn::apply(LLSelectNode* pNode)
+// Checked: 2009-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
+void RlvWLSnapshot::restoreSnapshot(const RlvWLSnapshot* pWLSnapshot)
 {
-	return (pNode->getObject()) && (pNode->getObject()->getRootEdit() == m_pObject);
+	LLWLParamManager* pWLParams = LLWLParamManager::instance();
+	if ( (pWLSnapshot) && (pWLParams) )
+	{
+		pWLParams->mAnimator.mIsRunning = pWLSnapshot->fIsRunning;
+		pWLParams->mAnimator.mUseLindenTime = pWLSnapshot->fUseLindenTime;
+		pWLParams->mCurParams = pWLSnapshot->WLParams;
+		pWLParams->propagateParameters();
+	}
 }
 
-// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0g
-bool rlvCanDeleteOrReturn()
+// Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
+RlvWLSnapshot* RlvWLSnapshot::takeSnapshot()
 {
-	bool fIsAllowed = true;
-
-	if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+	// HACK: see RlvExtGetSet::onGetEnv
+	if (!LLFloaterWindLight::isOpen())
 	{
-		// We'll allow if none of the prims are owned by the avie or group owned
-		LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
-		RlvSelectIsOwnedByOrGroupOwned func(gAgent.getID());
-		if ( (handleSel.notNull()) && ((0 == handleSel->getRootObjectCount()) || (NULL != handleSel->getFirstRootNode(&func, FALSE))) )
-			fIsAllowed = false;
+		LLFloaterWindLight::instance()->close();
+		LLFloaterWindLight::instance()->syncMenu();
 	}
-	
-	if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) )
+
+	RlvWLSnapshot* pWLSnapshot = NULL;
+	LLWLParamManager* pWLParams = LLWLParamManager::instance();
+	if (pWLParams)
 	{
-		// We'll allow if the avie isn't sitting on any of the selected objects
-		LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
-		RlvSelectIsSittingOn func(gAgent.getAvatarObject()->getRoot());
-		if ( (handleSel.notNull()) && (handleSel->getFirstRootNode(&func, TRUE)) )
-			fIsAllowed = false;
+		pWLSnapshot = new RlvWLSnapshot();
+		pWLSnapshot->fIsRunning = pWLParams->mAnimator.mIsRunning;
+		pWLSnapshot->fUseLindenTime = pWLParams->mAnimator.mUseLindenTime;
+		pWLSnapshot->WLParams = pWLParams->mCurParams;
 	}
-
-	return fIsAllowed;
+	return pWLSnapshot;
 }
 
-// Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
-BOOL rlvAttachToEnabler(void* pParam)
-{
-	// Enables/disables an option on the "Attach to (HUD)" submenu depending on whether it is (un)detachable
-	return gRlvHandler.isDetachable((LLViewerJointAttachment*)pParam);
-}
+// =========================================================================
+// RlvSettings
+//
+
+BOOL RlvSettings::fShowNameTags = FALSE;
+
+#ifdef RLV_EXTENSION_STARTLOCATION
+	// Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1d
+	void RlvSettings::updateLoginLastLocation()
+	{
+		if (gSavedPerAccountSettings.controlExists(RLV_SETTING_LOGINLASTLOCATION))
+		{
+			BOOL fValue = (gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)) ||
+						  ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) &&
+						    (gAgent.getAvatarObject()) && (!gAgent.getAvatarObject()->mIsSitting) );
+			if (gSavedPerAccountSettings.getBOOL(RLV_SETTING_LOGINLASTLOCATION) != fValue)
+			{
+				gSavedPerAccountSettings.setBOOL(RLV_SETTING_LOGINLASTLOCATION, fValue);
+				gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
+			}
+		}
+	}
+#endif // RLV_EXTENSION_STARTLOCATION
+
+// =========================================================================
+// Various helper classes/timers/functors
+//
 
 BOOL RlvGCTimer::tick()
 {
@@ -453,63 +420,84 @@ void RlvCurrentlyWorn::fetchWorn()
 	f.fetchItems(idItems);
 }
 
-// =========================================================================
+// Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0f
+bool RlvSelectHasLockedAttach::apply(LLSelectNode* pNode)
+{
+	return (pNode->getObject()) ? !gRlvHandler.isDetachable(pNode->getObject()) : false;
+}
 
-// Checked: 2009-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
-void RlvWLSnapshot::restoreSnapshot(const RlvWLSnapshot* pWLSnapshot)
+// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0f
+bool RlvSelectIsOwnedByOrGroupOwned::apply(LLSelectNode* pNode)
 {
-	LLWLParamManager* pWLParams = LLWLParamManager::instance();
-	if ( (pWLSnapshot) && (pWLParams) )
-	{
-		pWLParams->mAnimator.mIsRunning = pWLSnapshot->fIsRunning;
-		pWLParams->mAnimator.mUseLindenTime = pWLSnapshot->fUseLindenTime;
-		pWLParams->mCurParams = pWLSnapshot->WLParams;
-		pWLParams->propagateParameters();
-	}
+	return (pNode->mPermissions->isGroupOwned()) || (pNode->mPermissions->getOwner() == m_idAgent);
 }
 
-// Checked: 2009-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
-RlvWLSnapshot* RlvWLSnapshot::takeSnapshot()
+// Checked: 2009-05-31 (RLVa-0.2.0f) | Modified: RLVa-0.2.0f
+bool RlvSelectIsSittingOn::apply(LLSelectNode* pNode)
 {
-	RlvWLSnapshot* pWLSnapshot = NULL;
-	LLWLParamManager* pWLParams = LLWLParamManager::instance();
-	if (pWLParams)
+	return (pNode->getObject()) && (pNode->getObject()->getRootEdit() == m_pObject);
+}
+
+// ============================================================================
+// Various helper functions
+//
+
+// Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+BOOL rlvAttachToEnabler(void* pParam)
+{
+	// Enables/disables an option on the "Attach to (HUD)" submenu depending on whether it is (un)detachable
+	return gRlvHandler.isDetachable((LLViewerJointAttachment*)pParam);
+}
+
+// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0g
+bool rlvCanDeleteOrReturn()
+{
+	bool fIsAllowed = true;
+
+	if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
 	{
-		pWLSnapshot = new RlvWLSnapshot();
-		pWLSnapshot->fIsRunning = pWLParams->mAnimator.mIsRunning;
-		pWLSnapshot->fUseLindenTime = pWLParams->mAnimator.mUseLindenTime;
-		pWLSnapshot->WLParams = pWLParams->mCurParams;
+		// We'll allow if none of the prims are owned by the avie or group owned
+		LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
+		RlvSelectIsOwnedByOrGroupOwned func(gAgent.getID());
+		if ( (handleSel.notNull()) && ((0 == handleSel->getRootObjectCount()) || (NULL != handleSel->getFirstRootNode(&func, FALSE))) )
+			fIsAllowed = false;
 	}
-	return pWLSnapshot;
-}
 
-// =========================================================================
+	if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) )
+	{
+		// We'll allow if the avie isn't sitting on any of the selected objects
+		LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
+		RlvSelectIsSittingOn func(gAgent.getAvatarObject()->getRoot());
+		if ( (handleSel.notNull()) && (handleSel->getFirstRootNode(&func, TRUE)) )
+			fIsAllowed = false;
+	}
 
-BOOL RlvSettings::fShowNameTags = FALSE;
+	return fIsAllowed;
+}
 
-#ifdef RLV_EXTENSION_STARTLOCATION
-	// Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1d
-	void RlvSettings::updateLoginLastLocation()
+// Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+S32 rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type)
+{
+	S32 cntType = 0;
+	if (pFolder)
 	{
-		if (gSavedPerAccountSettings.controlExists(RLV_SETTING_LOGINLASTLOCATION))
+		LLInventoryModel::cat_array_t*  pFolders;
+		LLInventoryModel::item_array_t* pItems;
+		gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
+
+		if (pItems)
 		{
-			BOOL fValue = (gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)) || 
-						  ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && 
-						    (gAgent.getAvatarObject()) && (!gAgent.getAvatarObject()->mIsSitting) );
-			if (gSavedPerAccountSettings.getBOOL(RLV_SETTING_LOGINLASTLOCATION) != fValue)
-			{
-				gSavedPerAccountSettings.setBOOL(RLV_SETTING_LOGINLASTLOCATION, fValue);
-				gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
-			}
+			for (S32 idxItem = 0, cntItem = pItems->count(); idxItem < cntItem; idxItem++)
+				if (pItems->get(idxItem)->getType() == type)
+					cntType++;
 		}
 	}
-#endif // RLV_EXTENSION_STARTLOCATION
-
-// =========================================================================
+	return cntType;
+}
 
 #ifdef RLV_ADVANCED_TOGGLE_RLVA
 	// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-1.0.0h
-	void rlvDbgToggleEnabled(void*)
+	void rlvToggleEnabled(void*)
 	{
 		gSavedSettings.setBOOL(RLV_SETTING_MAIN, !rlv_handler_t::isEnabled());
 
@@ -526,7 +514,7 @@ BOOL RlvSettings::fShowNameTags = FALSE;
 		#endif
 	}
 	// Checked: 2009-07-08 (RLVa-1.0.0e)
-	BOOL rlvDbgGetEnabled(void*)
+	BOOL rlvGetEnabled(void*)
 	{
 		return rlv_handler_t::isEnabled();
 	}
@@ -568,7 +556,7 @@ void rlvSendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLU
 // Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
 bool rlvSendChatReply(S32 nChannel, const std::string& strReply)
 {
-	if (!rlvIsValidChannel(nChannel))
+	if (!rlvIsValidReplyChannel(nChannel))
 		return false;
 
 	// Copy/paste from send_chat_from_viewer()
diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
index 9ceb799..f36989b 100644
--- a/linden/indra/newview/rlvhelper.h
+++ b/linden/indra/newview/rlvhelper.h
@@ -7,266 +7,87 @@
 #include "llviewercontrol.h"
 #include "llviewerobjectlist.h"
 #include "llwlparamset.h"
-
-#include "rlvmultistringsearch.h"
-
-// ============================================================================
-// 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" feature through the RLVa debug menu
-#define RLV_EXTENSION_ENABLE_WEAR			// "Enable Wear"
-#define RLV_EXTENSION_HIDELOCKED			// "Hide locked layers", "Hide locked attachments" and "Hide locked inventory"
-#define RLV_EXTENSION_FLOATER_RESTRICTIONS	// Enables the Advanced / RLVa / Restrictions... floater
-
-// 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_FLAG_NOSTRIP			// Layers and attachments marked as "nostrip" are exempt from @detach/@remoutfit
-#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
-
-// Experimental features
-#ifdef RLV_EXPERIMENTAL
-	// Stable (will mature to RLV_EXTENSION_XXX in next release if no bugs are found)
-	#define RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK		// Enables "cleaner" UI responses when fartouch blocks something
-
-	// Under testing (stable, but requires further testing - safe for public release but may be quirky)
-
-	// Under development (don't include in public release)
-	#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
-	#endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
-#endif // RLV_EXPERIMENTAL
-
-// ============================================================================
-// Defines
-//
-
-// Version of the specifcation we support
-const S32 RLV_VERSION_MAJOR = 1;
-const S32 RLV_VERSION_MINOR = 20;
-const S32 RLV_VERSION_PATCH = 0;
-
-// Implementation version
-const S32 RLVa_VERSION_MAJOR = 1;
-const S32 RLVa_VERSION_MINOR = 0;
-const S32 RLVa_VERSION_PATCH = 2;
-const S32 RLVa_VERSION_BUILD = 2;
-
-// The official viewer version we're patching against
-#define RLV_MAKE_TARGET(x, y, z)	((x << 16) | (y << 8) | z)
-#define RLV_TARGET					RLV_MAKE_TARGET(1, 22, 11)
-
-// Defining these makes it easier if we ever need to change our tag
-#define RLV_WARNS	LL_WARNS("RLV")
-#define RLV_INFOS	LL_INFOS("RLV")
-#define RLV_DEBUGS	LL_DEBUGS("RLV")
-
-#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
-	// Turn on extended debugging information
-	#define RLV_DEBUG
-	// Make sure we halt execution on errors
-	#define RLV_ERRS  LL_ERRS("RLV")
-	// Uncomment to enable the Advanced / RLVa / Unit Tests menu (non-public)
-	//#define RLV_DEBUG_TESTS
-#else
-	// Uncomment if you want extended debugging information on release builds
-	//#define RLV_DEBUG
-	// Don't halt execution on errors in release
-	#define RLV_ERRS  LL_WARNS("RLV")
-#endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
-
-#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_FOLDER_FLAG_NOSTRIP			"nostrip"
-#define RLV_FOLDER_PREFIX_HIDDEN		'.'
-#define RLV_FOLDER_PREFIX_PUTINV    	'~'
+#include "rlvdefines.h"
 
 // ============================================================================
-// Enumeration declarations
+// RlvCommand
 //
 
-// NOTE: * any changes to this enumeration should be reflected in initLookupTable()
-//       * only uncomment the ones we actually use in a switch() to keep the size of the lookup table down
-enum ERlvBehaviour {
-	RLV_BHVR_VERSION = 0,			// "version"
-	RLV_BHVR_DETACH,				// "detach"
-//	RLV_BHVR_SENDCHAT,				// "sendchat"
-//	RLV_BHVR_EMOTE,					// "emote"
-//	RLV_BHVR_CHATSHOUT,				// "chatshout"
-//	RLV_BHVR_CHATNORMAL,			// "chatnormal"
-//	RLV_BHVR_CHATWHISPER,			// "chatwhisper"
-	RLV_BHVR_REDIRCHAT,				// "redirchat"
-	RLV_BHVR_REDIREMOTE,			// "rediremote"
-	RLV_BHVR_SENDIM,				// "sendim"
-	RLV_BHVR_RECVCHAT,				// "recvchat"
-	RLV_BHVR_RECVEMOTE,				// "recvemote"
-	RLV_BHVR_RECVIM,				// "recvim"
-//	RLV_BHVR_TPLM,					// "tplm"
-	RLV_BHVR_TPLOC,					// "tploc"
-	RLV_BHVR_TPLURE,				// "tplure"
-	RLV_BHVR_SITTP,					// "sittp"
-//	RLV_BHVR_CLEAR,					// "clear"
-	RLV_BHVR_EDIT,					// "edit"
-	RLV_BHVR_REZ,					// "rez"
-	RLV_BHVR_ADDOUTFIT,				// "addoutfit"
-	RLV_BHVR_REMOUTFIT,				// "remoutfit"
-	RLV_BHVR_GETOUTFIT,				// "getoutfit"
-	RLV_BHVR_GETATTACH,				// "getattach"
-	RLV_BHVR_SHOWINV,				// "showinv"
-//	RLV_BHVR_VIEWNOTE,				// "viewnote"
-	RLV_BHVR_UNSIT,					// "unsit"
-	RLV_BHVR_SIT,					// "sit"
-//	RLV_BHVR_SENDCHANNEL,			// "sendchannel"
-	RLV_BHVR_GETSTATUS,				// "getstatus"
-	RLV_BHVR_GETSTATUSALL,			// "getstatusall"
-	RLV_BHVR_GETINV,				// "getinv"
-	RLV_BHVR_GETINVWORN,			// "getinvworn"
-	RLV_BHVR_FINDFOLDER,			// "findfolder"
-	RLV_BHVR_FINDFOLDERS,			// "findfolders"
-	RLV_BHVR_ATTACH,				// "attach"
-	RLV_BHVR_ATTACHALL,				// "attachall"
-	RLV_BHVR_DETACHALL,				// "detachall"
-	RLV_BHVR_GETPATH,				// "getpath"
-	RLV_BHVR_ATTACHTHIS,			// "attachthis"
-	RLV_BHVR_ATTACHALLTHIS,			// "attachallthis"
-	RLV_BHVR_DETACHTHIS,			// "detachthis"
-	RLV_BHVR_DETACHALLTHIS,			// "detachallthis"
-	RLV_BHVR_FARTOUCH,				// "fartouch"
-	RLV_BHVR_SHOWWORLDMAP,			// "showworldmap"
-	RLV_BHVR_SHOWMINIMAP,			// "showminimap"
-	RLV_BHVR_SHOWLOC,				// "showloc"
-	RLV_BHVR_TPTO,					// "tpto"
-	RLV_BHVR_ACCEPTTP,				// "accepttp"
-	RLV_BHVR_SHOWNAMES,				// "shownames"
-	RLV_BHVR_FLY,					// "fly"
-	RLV_BHVR_GETSITID,				// "getsitid"
-	RLV_BHVR_SETDEBUG,				// "setdebug"
-	RLV_BHVR_SETENV,				// "setenv"
-	RLV_BHVR_DETACHME,				// "detachme"
-	RLV_BHVR_SHOWHOVERTEXTALL,		// "showhovertextall"
-	RLV_BHVR_SHOWHOVERTEXTWORLD,	// "showhovertextworld"
-	RLV_BHVR_SHOWHOVERTEXTHUD,		// "showhovertexthud"
-	RLV_BHVR_SHOWHOVERTEXT,			// "showhovertext"
-	RLV_BHVR_NOTIFY,				// "notify"
-
-	RLV_BHVR_COUNT,
-	RLV_BHVR_UNKNOWN
-};
-
-enum ERlvParamType {
-	RLV_TYPE_UNKNOWN,
-	RLV_TYPE_ADD,				// <param> == "n"|"add"
-	RLV_TYPE_REMOVE,			// <param> == "y"|"rem"
-	RLV_TYPE_FORCE,				// <param> == "force"
-	RLV_TYPE_REPLY				// <param> == <number>
-};
-
-enum ERlvCmdRet {
-	RLV_RET_NOERROR,			// Command executed succesfully
-	RLV_RET_RETAINED,			// Command was retained
-	RLV_RET_FAILED,				// Command failed (general failure)
-	RLV_RET_FAILED_SYNTAX,		// Command failed (syntax error)
-	RLV_RET_FAILED_UNSET,		// Command failed (unset restriction)
-	RLV_RET_FAILED_DUPLICATE,	// Command failed (duplicate)
-	RLV_RET_FAILED_OPTION,		// Command failed (invalid option)
-	RLV_RET_UNKNOWN				// Command unkown
-};
-
-// ============================================================================
-/*
- * RlvCommand
- * ==========
- * Encapsulates an "RLV command" (duh :p)
- *
- */
-
 class RlvCommand
 {
 public:
-	/*
-	 * Constructors
-	 */
 	explicit RlvCommand(const std::string& strCommand);
-	RlvCommand(const RlvCommand& rlvCmd);
 
 	/*
-	 * Accessors
+	 * Member functions
 	 */
-	BOOL isValid() const { return m_fValid; }
+public:
+	std::string        asString() const;
+	const std::string& getBehaviour() const     { return m_strBehaviour; }
+	ERlvBehaviour      getBehaviourType() const { return m_eBehaviour; }
+	const std::string& getOption() const        { return m_strOption; }
+	const std::string& getParam() const         { return m_strParam; }
+	ERlvParamType      getParamType() const     { return m_eParamType; }
+	bool               isValid() const          { return m_fValid; }
 
-	const std::string& getBehaviour() const		{ return m_strBehaviour; }
-	ERlvBehaviour      getBehaviourType() const	{ return m_eBehaviour; }
-	const std::string& getOption() const		{ return m_strOption; }
-	const std::string& getParam() const			{ return m_strParam; }
-	ERlvParamType      getParamType() const		{ return m_eParamType; }
+	static ERlvBehaviour      getBehaviourFromString(const std::string& strBhvr);
+	static const std::string& getStringFromBehaviour(ERlvBehaviour eBhvr);
 
-	std::string        asString() const;
+	static void initLookupTable();
+protected:
+	static bool parseCommand(const std::string& strCommand, std::string& strBehaviour, std::string& strOption,  std::string& strParam);
 
 	/*
 	 * Operators
 	 */
+public:
 	bool operator ==(const RlvCommand&) const;
 
-	// Parses an RLV command into its "tokens"
-	static BOOL parseCommand(/*[in]*/ const std::string& strCommand,  
-		/*[out]*/ std::string& strBehaviour, /*[out]*/ std::string& strOption, /*[out]*/ std::string& strParam);
-	static void initLookupTable();
-
 	/*
 	 * Member variables
 	 */
 protected:
-	BOOL			m_fValid;
-	std::string		m_strBehaviour;
+	bool         	m_fValid;
+	std::string  	m_strBehaviour;
 	ERlvBehaviour	m_eBehaviour;
-	std::string		m_strOption;
-	std::string		m_strParam;
+	std::string  	m_strOption;
+	std::string  	m_strParam;
 	ERlvParamType	m_eParamType;
 
-	static RlvMultiStringSearch m_BhvrLookup;
+	typedef std::map<std::string, ERlvBehaviour> RlvBhvrTable;
+	static RlvBhvrTable m_BhvrMap;
+
 	friend class RlvHandler;
 };
+typedef std::list<RlvCommand> rlv_command_list_t;
 
 // ============================================================================
-/*
- * RlvObject
- * =========
- * Encapsulates an "RLV Object" (= an object that has issued an RLV command)
- *
- */
-
-typedef std::list<RlvCommand> rlv_command_list_t;
+// RlvObject
+//
 
 class RlvObject
 {
 public:
-	RlvObject(const LLUUID& uuid) : m_UUID(uuid), m_nLookupMisses(0)
-	{
-		LLViewerObject* pObj = gObjectList.findObject(uuid);
-		m_fLookup = (NULL != pObj);
-		m_idxAttachPt = (pObj) ? ATTACHMENT_ID_FROM_STATE(pObj->getState()) : 0;
-	}
-
-	BOOL addCommand(const RlvCommand& rlvCmd);
-	BOOL removeCommand(const RlvCommand& rlvCmd);
+	RlvObject(const LLUUID& idObj);
 
-	BOOL hasBehaviour(ERlvBehaviour eBehaviour) const;
-	BOOL hasBehaviour(const std::string& strBehaviour) const;
-	BOOL hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const;
-	BOOL hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const;
+	/*
+	 * Member functions
+	 */
+public:
+	bool addCommand(const RlvCommand& rlvCmd);
+	bool removeCommand(const RlvCommand& rlvCmd);
 
 	std::string getStatusString(const std::string& strMatch) const;
+	bool        hasBehaviour(ERlvBehaviour eBehaviour) const;
+	bool        hasBehaviour(const std::string& strBehaviour) const;
+	bool        hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const;
+	bool        hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const;
 
 	const rlv_command_list_t* getCommandList() const { return &m_Commands; }
+
+	/*
+	 * Member variables
+	 */
 protected:
 	LLUUID             m_UUID;				// The object's UUID
 	S32                m_idxAttachPt;		// The object's attachment point (or 0 if it's not an attachment)
@@ -278,12 +99,8 @@ protected:
 };
 
 // ============================================================================
-/*
- * RlvCriteriaCategoryCollector
- * ============================
- * Criteria based folder matching filter used by @findfolder and @findfolders
- *
- */
+// RlvCriteriaCategoryCollector - Criteria based folder matching filter used by @findfolder and @findfolders
+//
 
 class RlvCriteriaCategoryCollector : public LLInventoryCollectFunctor
 {
@@ -325,12 +142,8 @@ protected:
 };
 
 // ============================================================================
-/*
- * RlvWearableItemCollector
- * ========================
- * Inventory item filter used by attach/detach/attachall/detachall/getinvworn
- *
- */
+// RlvWearableItemCollector - Inventory item filter used by attach/detach/attachall/detachall/getinvworn
+//
 
 class RlvWearableItemCollector : public LLInventoryCollectFunctor
 {
@@ -397,19 +210,6 @@ private:
 // RlvSettings
 //
 
-#define RLV_SETTING_MAIN				"RestrainedLife"
-#define RLV_SETTING_DEBUG				"RestrainedLifeDebug"
-#define RLV_SETTING_NOSETENV			"RestrainedLifeNoSetEnv"
-#define RLV_SETTING_FORBIDGIVETORLV		"RestrainedLifeForbidGiveToRLV"
-
-#define RLV_SETTING_ENABLEWEAR			"RLVaEnableWear"
-#define RLV_SETTING_ENABLELEGACYNAMING  "RLVaEnableLegacyNaming"
-#define RLV_SETTING_HIDELOCKEDLAYER		"RLVaHideLockedLayers"
-#define RLV_SETTING_HIDELOCKEDATTACH	"RLVaHideLockedAttachments"
-#define RLV_SETTING_HIDELOCKEDINVENTORY	"RLVaHideLockedInventory"
-#define RLV_SETTING_LOGINLASTLOCATION	"RLVaLoginLastLocation"
-#define RLV_SETTING_SHOWNAMETAGS		"RLVaShowNameTags"
-
 inline BOOL rlvGetSettingBOOL(const std::string& strSetting, BOOL fDefault)
 {
 	return (gSavedSettings.controlExists(strSetting)) ? gSavedSettings.getBOOL(strSetting) : fDefault;
@@ -429,6 +229,7 @@ public:
 	static BOOL getHideLockedLayers()		{ return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDLAYER, FALSE); }		
 	static BOOL getHideLockedAttach()		{ return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDATTACH, FALSE); }
 	static BOOL getHideLockedInventory()	{ return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDINVENTORY, FALSE); }
+	static BOOL getShowNameTags()			{ return fShowNameTags; }
 
 	#ifdef RLV_EXTENSION_STARTLOCATION
 		static BOOL getLoginLastLocation()	{ return rlvGetPerUserSettingsBOOL(RLV_SETTING_LOGINLASTLOCATION, TRUE); }
@@ -442,24 +243,6 @@ public:
 // State keeping classes/structure
 //
 
-struct RlvRedirInfo
-{
-	S16 nRedirChat;
-	S16 nRedirEmote;
-
-	RlvRedirInfo() : nRedirChat(0), nRedirEmote(0) {}
-	bool isActive() { return (nRedirChat + nRedirEmote) != 0; }
-};
-
-struct RlvReattachInfo
-{
-	LLUUID idItem;
-	bool   fInInventory;
-	bool   fAssetSaved;
-
-	RlvReattachInfo() : idItem(), fInInventory(false), fAssetSaved(false) {}
-};
-
 // ============================================================================
 // Various helper classes/timers/functors
 //
@@ -509,7 +292,7 @@ BOOL rlvAttachToEnabler(void* pParam);
 bool rlvCanDeleteOrReturn();
 S32  rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type);
 bool rlvIsEmote(const std::string& strUTF8Text);
-bool rlvIsValidChannel(S32 nChannel);
+bool rlvIsValidReplyChannel(S32 nChannel);
 bool rlvIsWearingItem(const LLInventoryItem* pItem);
 
 void rlvForceDetach(LLViewerJointAttachment* pAttachPt);
@@ -517,24 +300,33 @@ void rlvSendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLU
 bool rlvSendChatReply(const std::string& strChannel, const std::string& strReply);
 bool rlvSendChatReply(S32 nChannel, const std::string& strReply);
 
-void rlvStringReplace(std::string& strText, std::string strFrom, const std::string& strTo);
 std::string rlvGetFirstParenthesisedText(const std::string& strText, std::string::size_type* pidxMatch = NULL);
 std::string rlvGetLastParenthesisedText(const std::string& strText, std::string::size_type* pidxStart = NULL);
-
-// ============================================================================
-// Debug helper functions
-//
+void        rlvStringReplace(std::string& strText, std::string strFrom, const std::string& strTo);
 
 #ifdef RLV_ADVANCED_TOGGLE_RLVA
 	// "Advanced / RLVa / Enable RLV" menu option
-	void rlvDbgToggleEnabled(void*);
-	BOOL rlvDbgGetEnabled(void*);
+	void rlvToggleEnabled(void*);
+	BOOL rlvGetEnabled(void*);
 #endif // RLV_ADVANCED_TOGGLE_RLVA
 
 // ============================================================================
+// Debug helper functions
+//
+
+// ============================================================================
 // Inlined class member functions
 //
 
+// Checked: 2009-09-19 (RLVa-1.0.3d)
+inline std::string RlvCommand::asString() const
+{
+	// NOTE: @clear=<param> should be represented as clear:<param>
+	return (m_eParamType != RLV_TYPE_CLEAR)
+		? (!m_strOption.empty()) ? (std::string(m_strBehaviour)).append(":").append(m_strOption) : (std::string(m_strBehaviour))
+	    : (!m_strParam.empty())  ? (std::string(m_strBehaviour)).append(":").append(m_strParam)  : (std::string(m_strBehaviour));
+}
+
 inline bool RlvCommand::operator ==(const RlvCommand& rhs) const
 {
 	// The specification notes that "@detach=n" is semantically identical to "@detach=add" (same for "y" and "rem"
@@ -562,7 +354,7 @@ inline bool rlvIsEmote(const std::string& strUTF8Text)
 }
 
 // Checked: 2009-09-05 (RLVa-1.0.2a) | Added: RLVa-1.0.2a
-inline bool rlvIsValidChannel(S32 nChannel)
+inline bool rlvIsValidReplyChannel(S32 nChannel)
 {
 	return (nChannel > 0) && (CHAT_CHANNEL_DEBUG != nChannel);
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index d0ac192..edfe62c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5222,5 +5222,22 @@ WARNING: Don't restore if you aren't sure where the object will go!
 		</option>
 	</alert>
 
+  <!-- [RLVa:KB] -->
+	<alert modal="true" name="FirstRLVGiveToRLV">
+		<message name="message">
+Folders starting with &apos;#RLV/~&apos; can automatically be placed under your #RLV shared folder after you accept the inventory offer.
+
+Please note that - if enabled - the accepted inventory items will instantly be available to scripts and will have full use of the RLV API which may cause unexpected or undesirable situations.
+
+Do you want to enable this feature?
+		</message>
+		<option name="Yes">
+			Yes
+		</option>
+		<option name="No">
+			No
+		</option>
+  </alert>
+  <!-- [/RLVa:KB] -->
 </alerts>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 9da0ec5..8d55a3b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1402,11 +1402,33 @@
 
     <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
 
+      <menu name="Debug" drop_shadow="true" opaque="true" tear_off="true">
+
+        <menu_item_check name="Show Debug Messages"
+                         label="Show Debug Messages">
+          <on_click function="ToggleControl" userdata="RestrainedLifeDebug" />
+          <on_check control="RestrainedLifeDebug" />
+        </menu_item_check>
+
+        <menu_item_separator />
+
+        <menu_item_check name="Enable Legacy Naming"
+                         label="Enable Legacy Naming">
+          <on_click function="ToggleControl" userdata="RLVaEnableLegacyNaming" />
+          <on_check control="RLVaEnableLegacyNaming" />
+        </menu_item_check>
+
+      </menu>
+
+      <menu_item_separator />
+
       <menu_item_check name="Enable Wear" label="Enable Wear">
         <on_click function="ToggleControl" userdata="RLVaEnableWear" />
         <on_check control="RLVaEnableWear" />
       </menu_item_check>
-      
+
+      <menu_item_separator />
+
       <menu_item_check name="Hide locked layers" label="Hide locked layers">
         <on_click function="ToggleControl" userdata="RLVaHideLockedLayers" />
         <on_check control="RLVaHideLockedLayers" />
@@ -1428,6 +1450,22 @@
       </menu_item_check>
       -->
 
+      <menu_item_separator />
+
+      <menu_item_check name="Forbid Give to #RLV" label="Forbid Give to #RLV">
+        <on_click function="ToggleControl"
+                  userdata="RestrainedLifeForbidGiveToRLV" />
+        <on_check control="RestrainedLifeForbidGiveToRLV" />
+      </menu_item_check>
+
+      <menu_item_check name="Show Name Tags" label="Show Name Tags">
+        <on_click function="ToggleControl"
+                  userdata="RLVaShowNameTags" />
+        <on_check control="RLVaShowNameTags" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
       <menu_item_call name="Restrictions..." label="Restrictions...">
         <on_click function="RLVa.Behaviors.Show" userdata="" />
       </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 01e2546..2716f25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -923,7 +923,24 @@ You can find example sculpted textures in the inventory library.
 			You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
 		</message>
 	</notify>
-	<notify name="MaxListSelectMessage" tip="true">
+  <!-- [RLVa:KB] -->
+  <notify name="FirstRLVDetach" tip="false">
+    <message name="message">
+One of your attachments was made nondetachable using Restrained Life.
+Please note that this also disables the &apos;Wear&apos; option on all prim attachments in your inventory unless they are properly named.
+
+For more information search for &apos;Restrained Life&apos; on the SL wiki.
+    </message>
+  </notify>
+  <notify name="FirstRLVFartouch" tip="false">
+    <message name="message">
+You have been fartouch restricted: you will be unable to touch objects farther than 1.5m from your avatar until the restriction is lifted.
+
+Tip: if an object is out of range the mouse cursor will not change as you hover over it and you'll hear an error sound if you try to right-click it.
+    </message>
+  </notify>
+  <!-- [/RLVa:KB] -->
+  <notify name="MaxListSelectMessage" tip="true">
 		<message name="message">
 			You may only select up to [MAX_SELECT] items
 from this list.
-- 
cgit v1.1


From acfbefb54cc7c3ea78933a5f0e9118286b5211de Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 7 Oct 2009 04:34:54 -0700
Subject: Fixed random mouseclicks on the edge of the window

---
 linden/indra/newview/llviewerwindow.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 99bbb2a..df10b4f 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -596,7 +596,14 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 	}
 
 	// Make sure we get a coresponding mouseup event, even if the mouse leaves the window
-	mWindow->captureMouse();
+	if (down)
+	{
+		mWindow->captureMouse();
+	}
+	else
+	{
+		mWindow->releaseMouse();
+	}
 
 	// Indicate mouse was active
 	gMouseIdleTimer.reset();
-- 
cgit v1.1


From 4bd4150d06bfd3a47bdcd2b47d388a6453980e70 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 7 Oct 2009 22:31:02 -0700
Subject: Added typing info to mini-map radar

---
 linden/indra/newview/llfloatermap.cpp              | 36 ++++++++++++++++++++--
 linden/indra/newview/llfloatermap.h                |  6 +++-
 linden/indra/newview/llviewermessage.cpp           | 16 ++++++++++
 .../skins/default/xui/en-us/floater_mini_map.xml   |  5 ++-
 4 files changed, 59 insertions(+), 4 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index e90e3b4..ae5b2b6 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -80,6 +80,7 @@ LLFloaterMap::LLFloaterMap(const LLSD& key)
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
 
 	mChatAvatars.clear();
+	mTypingAvatars.clear();
 }
 
 
@@ -303,11 +304,18 @@ void LLFloaterMap::populateRadar()
 					mChatAvatars.clear();
 				}
 
-				std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
+				// append typing string
+				std::string typing = "";
+				if (getIsTyping(avatar_ids[i]))
+				{
+					typing = getString("is_typing")+ " ";
+				}
+
+				std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("is_muted") : "";
 				element["id"] = avatar_ids[i];
 				element["columns"][0]["column"] = "avatar_name";
 				element["columns"][0]["type"] = "text";
-				element["columns"][0]["value"] = fullname + " " + mute_text;
+				element["columns"][0]["value"] = typing + fullname + " " + mute_text;
 				element["columns"][1]["column"] = "avatar_distance";
 				element["columns"][1]["type"] = "text";
 				element["columns"][1]["value"] = dist_string+"m";
@@ -384,6 +392,30 @@ void LLFloaterMap::removeFromChatList(LLUUID agent_id)
 	mChatAvatars.erase(agent_id);
 }
 
+bool LLFloaterMap::getIsTyping(LLUUID agent_id)
+{
+	if (mTypingAvatars.count(agent_id) > 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+void LLFloaterMap::updateTypingList(LLUUID agent_id, bool remove)
+{
+	if (remove)
+	{
+		if (getIsTyping(agent_id))
+		{
+			mTypingAvatars.erase(agent_id);	
+		}
+	}
+	else
+	{
+		mTypingAvatars.insert(agent_id);
+	}
+}
+
 void LLFloaterMap::toggleButtons()
 {
 	BOOL enable = FALSE;
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index deb972b..6e44a1e 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -52,6 +52,9 @@ public:
 	// returns true if agent_id belongs to a developer listed in llfloatermap.cpp
 	static bool isImpDev(LLUUID agent_id);
 
+	bool getIsTyping(LLUUID agent_id);
+	void updateTypingList(LLUUID agent_id, bool remove);
+
 	BOOL postBuild();
 
 	/*virtual*/ void	draw();
@@ -69,7 +72,8 @@ private:
 	LLNetMap*				mPanelMap;
 	LLScrollListCtrl*		mRadarList;
 	LLUUID					mSelectedAvatar;
-	std::set<LLUUID>		mChatAvatars; 
+	std::set<LLUUID>		mChatAvatars;
+	std::set<LLUUID>		mTypingAvatars; 
 	bool					mUpdate;
 	
 	static void onList(LLUICtrl* ctrl, void* user_data);
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 464d687..c9e0f7f 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -78,6 +78,7 @@
 #include "llfloatergroupinfo.h"
 #include "llfloaterimagepreview.h"
 #include "llfloaterland.h"
+#include "llfloatermap.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterlandholdings.h"
 #include "llurldispatcher.h"
@@ -2547,6 +2548,12 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			{
 				((LLVOAvatar*)chatter)->startTyping();
 			}
+
+			if (LLFloaterMap::getInstance())
+			{
+				LLFloaterMap::getInstance()->updateTypingList(from_id, false);
+			}
+
 			return;
 		}
 		else if (CHAT_TYPE_STOP == chat.mChatType)
@@ -2558,6 +2565,15 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			{
 				((LLVOAvatar*)chatter)->stopTyping();
 			}
+
+			if (LLFloaterMap::getInstance())
+			{
+				if (LLFloaterMap::getInstance()->getIsTyping(from_id))
+				{
+					LLFloaterMap::getInstance()->updateTypingList(from_id, true);
+				}
+			}
+
 			return;
 		}
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 2cb46b7..dd9c324 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -92,9 +92,12 @@
   <string name="no_one_near">
     No avatars within range
   </string>
-  <string name="muted">
+  <string name="is_muted">
     (muted)
   </string>
+  <string name="is_typing">
+    (typing)
+  </string>
   <string name="entering_chat_range">
     [NAME] has entered chat range ([DISTANCE]m)
   </string>
-- 
cgit v1.1


From 64d298ac17b47805f3deec99fc911bd8f73a9d2d Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Oct 2009 02:01:55 -0700
Subject: Mini-map radar now can notify you when someone enters the sim

---
 linden/indra/newview/app_settings/settings.xml     | 13 +++-
 linden/indra/newview/llfloatermap.cpp              | 73 +++++++++++++++++++++-
 linden/indra/newview/llfloatermap.h                | 12 +++-
 linden/indra/newview/llpanelgeneral.cpp            |  6 +-
 .../skins/default/xui/en-us/floater_mini_map.xml   |  3 +
 .../xui/en-us/panel_preferences_general.xml        | 17 ++++-
 6 files changed, 116 insertions(+), 8 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 8ffcb19..f167840 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5088,7 +5088,7 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>MiniMapNotify</key>
+    <key>MiniMapNotifyChatRange</key>
     <map>
       <key>Comment</key>
       <string>Notify when avatars enter chat range</string>
@@ -5099,6 +5099,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>MiniMapNotifySimRange</key>
+    <map>
+      <key>Comment</key>
+      <string>Notify when avatars enters the current sim</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>MiniMapPrimMaxRadius</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index ae5b2b6..142d8fe 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -266,10 +266,14 @@ void LLFloaterMap::populateRadar()
 			std::string fullname = getSelectedName(avatar_ids[i]);
 			if (!fullname.empty())
 			{
+				bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
+				bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
 	// [RLVa:KB] - Alternate: Imprudence-1.2.0
 				if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
 				{
 					fullname = gRlvHandler.getAnonym(fullname);
+					notify_chat = false;
+					notify_sim = false;
 				}
 	// [/RLVa:KB]
 
@@ -280,7 +284,7 @@ void LLFloaterMap::populateRadar()
 				sprintf(dist, "%.1f", distance);
 				std::string dist_string = dist;
 
-				if (gSavedSettings.getBOOL("MiniMapNotify"))
+				if (notify_chat)
 				{
 					if (distance < 20.0f)
 					{
@@ -304,6 +308,31 @@ void LLFloaterMap::populateRadar()
 					mChatAvatars.clear();
 				}
 
+				// announce their presence in the sim if we've enabled that
+				if (notify_sim)
+				{
+					if (!getInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
+					{
+						LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
+						if (av_obj != NULL && av_obj->isAvatar())
+						{
+							LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
+							if (avatarp != NULL)
+							{
+								if (avatarp->getRegion() == gAgent.getRegion())
+								{
+									addToSimAvList(avatar_ids[i], dist_string);
+								}
+							}
+						}
+					}
+					updateSimAvList(avatar_ids);
+				}
+				else if (!mSimAvatars.empty())
+				{
+					mSimAvatars.clear();
+				}
+
 				// append typing string
 				std::string typing = "";
 				if (getIsTyping(avatar_ids[i]))
@@ -334,6 +363,7 @@ void LLFloaterMap::populateRadar()
 	}
 	else
 	{
+		mTypingAvatars.clear();
 		mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
 		avatar_count << "0";
 	}
@@ -416,6 +446,47 @@ void LLFloaterMap::updateTypingList(LLUUID agent_id, bool remove)
 	}
 }
 
+void LLFloaterMap::updateSimAvList(std::vector<LLUUID> agent_ids)
+{
+	std::set<LLUUID>::iterator it;
+	std::vector<LLUUID>::iterator result;
+	for (it = mSimAvatars.begin(); it != mSimAvatars.end(); )
+	{
+		result = find(agent_ids.begin(), agent_ids.end(), *it);
+		if (result == agent_ids.end())
+		{
+			mSimAvatars.erase(it++);
+		}
+		else
+		{
+			it++;
+		}
+	}
+}
+
+void LLFloaterMap::addToSimAvList(LLUUID agent_id, std::string distance)
+{
+	mSimAvatars.insert(agent_id);
+	LLChat chat;
+
+	LLUIString notify = getString("entering_sim_range");
+	notify.setArg("[NAME]", getSelectedName(agent_id));
+	notify.setArg("[DISTANCE]", distance);
+
+	chat.mText = notify;
+	chat.mSourceType = CHAT_SOURCE_SYSTEM;
+	LLFloaterChat::addChat(chat, FALSE, FALSE);	
+}
+
+bool LLFloaterMap::getInSimAvList(LLUUID agent_id)
+{
+	if (mSimAvatars.count(agent_id) > 0)
+	{
+		return true;
+	}
+	return false;
+}
+
 void LLFloaterMap::toggleButtons()
 {
 	BOOL enable = FALSE;
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 6e44a1e..af4d1cc 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -67,13 +67,19 @@ public:
 
 
 private:
+
 	LLFloaterMap(const LLSD& key = LLSD());
 
 	LLNetMap*				mPanelMap;
 	LLScrollListCtrl*		mRadarList;
 	LLUUID					mSelectedAvatar;
+
+	// TODO: move all this info into its own object. It's stupid 
+	// and bug-prone to keep it all in separate containers, but 
+	// I want to get this out for 1.2 -- McCabe
 	std::set<LLUUID>		mChatAvatars;
-	std::set<LLUUID>		mTypingAvatars; 
+	std::set<LLUUID>		mTypingAvatars;
+	std::set<LLUUID>		mSimAvatars;
 	bool					mUpdate;
 	
 	static void onList(LLUICtrl* ctrl, void* user_data);
@@ -88,6 +94,10 @@ private:
 	void addToChatList(LLUUID agent_id, std::string distance);
 	void removeFromChatList(LLUUID agent_id);
 
+	bool getInSimAvList(LLUUID agent_id);
+	void addToSimAvList(LLUUID agent_id, std::string distance);
+	void updateSimAvList(std::vector<LLUUID> agent_ids);
+
 	static void onClickProfile(void* user_data);
 	static void onClickIM(void* user_data);
 	static void onClickAddFriend(void* user_data);
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 4cf4091..04b7afe 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -60,7 +60,8 @@ BOOL LLPanelGeneral::postBuild()
 	childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
 	childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
 	childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
-	childSetValue("mini_map_notify", gSavedSettings.getBOOL("MiniMapNotify"));
+	childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
+	childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
 	childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
 	childSetValue("use_system_color_picker_checkbox", gSavedSettings.getBOOL("UseDefaultColorPicker"));
 	childSetValue("show_search_panel", gSavedSettings.getBOOL("ShowSearchBar"));
@@ -98,7 +99,8 @@ void LLPanelGeneral::apply()
 	gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
 	gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
 	gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
-	gSavedSettings.setBOOL("MiniMapNotify", childGetValue("mini_map_notify"));
+	gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
+	gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
 	gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
 	gSavedSettings.setBOOL("UseDefaultColorPicker", childGetValue("use_system_color_picker_checkbox"));
 	gSavedSettings.setBOOL("ShowSearchBar", childGetValue("show_search_panel"));
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index dd9c324..3baec3f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -101,4 +101,7 @@
   <string name="entering_chat_range">
     [NAME] has entered chat range ([DISTANCE]m)
   </string>
+  <string name="entering_sim_range">
+    [NAME] has entered the sim ([DISTANCE]m)
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 56bdb28..0c18a62 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -77,11 +77,22 @@
 	     follows="left|top" height="16" increment="1" initial_val="300"
 	     label="Away Timeout:" label_width="141" left="10" max_val="600"
 	     min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
-  <check_box bottom_delta="-25" enabled="true"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+     mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+    Mini-map notify:
+  </text>
+  <check_box bottom_delta="0" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Display mini-map messages in chat" left="151"
-	     mouse_opaque="true" name="mini_map_notify" radio_style="false"
+	     label="Entering chat range" left="151"
+	     mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
 	     width="256" />
+  <check_box bottom_delta="0" enabled="true"
+     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+     label="Entering sim" left="330"
+     mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
+     width="256" />
 	<check_box bottom="-304" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Notify when Linden dollars (L$) spent or received" left="151"
-- 
cgit v1.1


From af3e9ef15886ab01bd123a2fc1cec5cf0f08b357 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Oct 2009 03:01:21 -0700
Subject: Clickable IMs in chat history was causing readability problems at
 varying distances, decided it was a bug and fixed it

---
 linden/indra/newview/llfloaterchat.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index cc86fce..5cb4282 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -215,7 +215,8 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
 	// If the chat line has an associated url, link it up to the name.
 	if (!chat.mURL.empty() && 
 		(line.length() > chat.mFromName.length() && 
-		(line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0)))
+		(line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0)) &&
+		color == gSavedSettings.getColor4("ObjectIMColor")) // hack to make sure IMs in chat history don't hightlight
 	{
 		std::string start_line;
 		if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: "
-- 
cgit v1.1


From f9bf7355ba74bbff8b043a35cdab2bb7bac7a2cb Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Oct 2009 11:47:03 -0700
Subject: Fixed entering sim notification being tied to radar range

---
 linden/indra/newview/llfloatermap.cpp | 47 +++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 22 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 142d8fe..0ee0f2b 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -237,16 +237,16 @@ void LLFloaterMap::populateRadar()
 
 	S32 scroll_pos = mRadarList->getScrollPos();
 
-	LLVector3d current_pos = gAgent.getPositionGlobal();
-
 	// clear count
 	std::stringstream avatar_count; 
 	avatar_count.str("");
 
 	// find what avatars you can see
+	F32 range = gSavedSettings.getF32("NearMeRange");
+	LLVector3d current_pos = gAgent.getPositionGlobal();
 	std::vector<LLUUID> avatar_ids;
 	std::vector<LLVector3d> positions;
-	LLWorld::getInstance()->getAvatars(&avatar_ids, &positions, current_pos, gSavedSettings.getF32("NearMeRange"));
+	LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
 
 	LLSD element;
 
@@ -277,12 +277,13 @@ void LLFloaterMap::populateRadar()
 				}
 	// [/RLVa:KB]
 
-				// check if they're in chat range and notify user
+				// check if they're in certain ranges and notify user if we've enabled that
 				LLVector3d temp = positions[i] - current_pos;
 				F32 distance = llround((F32)temp.magVec(), 0.1f);
-				char dist[32];
+				/*char dist[32];
 				sprintf(dist, "%.1f", distance);
-				std::string dist_string = dist;
+				std::string dist_string = dist;*/
+				std::string dist_string = llformat("%.1f", distance);
 
 				if (notify_chat)
 				{
@@ -300,7 +301,6 @@ void LLFloaterMap::populateRadar()
 							removeFromChatList(avatar_ids[i]);
 						}
 					}
-
 					updateChatList(avatar_ids);
 				}
 				else if (!mChatAvatars.empty())
@@ -308,7 +308,6 @@ void LLFloaterMap::populateRadar()
 					mChatAvatars.clear();
 				}
 
-				// announce their presence in the sim if we've enabled that
 				if (notify_sim)
 				{
 					if (!getInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
@@ -333,23 +332,27 @@ void LLFloaterMap::populateRadar()
 					mSimAvatars.clear();
 				}
 
-				// append typing string
-				std::string typing = "";
-				if (getIsTyping(avatar_ids[i]))
+				// only display avatars in range
+				if (distance <= range)
 				{
-					typing = getString("is_typing")+ " ";
-				}
+					// append typing string
+					std::string typing = "";
+					if (getIsTyping(avatar_ids[i]))
+					{
+						typing = getString("is_typing")+ " ";
+					}
 
-				std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("is_muted") : "";
-				element["id"] = avatar_ids[i];
-				element["columns"][0]["column"] = "avatar_name";
-				element["columns"][0]["type"] = "text";
-				element["columns"][0]["value"] = typing + fullname + " " + mute_text;
-				element["columns"][1]["column"] = "avatar_distance";
-				element["columns"][1]["type"] = "text";
-				element["columns"][1]["value"] = dist_string+"m";
+					std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("is_muted") : "";
+					element["id"] = avatar_ids[i];
+					element["columns"][0]["column"] = "avatar_name";
+					element["columns"][0]["type"] = "text";
+					element["columns"][0]["value"] = typing + fullname + " " + mute_text;
+					element["columns"][1]["column"] = "avatar_distance";
+					element["columns"][1]["type"] = "text";
+					element["columns"][1]["value"] = dist_string+"m";
 
-				mRadarList->addElement(element, ADD_BOTTOM);
+					mRadarList->addElement(element, ADD_BOTTOM);
+				}
 			}
 		}
 
-- 
cgit v1.1


From c76f9f1fc388d23c047a41c68e8361068b2e4c3c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Oct 2009 12:02:28 -0700
Subject: Fixed stupid error on my part that broke clickable names in chat
 history

---
 linden/indra/newview/llfloaterchat.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 5cb4282..79c4aa6 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -213,10 +213,9 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
 	}
 
 	// If the chat line has an associated url, link it up to the name.
-	if (!chat.mURL.empty() && 
-		(line.length() > chat.mFromName.length() && 
-		(line.find(chat.mFromName,0) == 4 || line.find(chat.mFromName,0) == 0)) &&
-		color == gSavedSettings.getColor4("ObjectIMColor")) // hack to make sure IMs in chat history don't hightlight
+	if ((!chat.mURL.empty() && line.length() > chat.mFromName.length()) && 
+		(line.find(chat.mFromName,0) == 0 || (line.find(chat.mFromName,0) == 4 &&
+		color == gSavedSettings.getColor4("ObjectIMColor")))) // hack to make sure IMs in chat history don't hightlight
 	{
 		std::string start_line;
 		if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: "
-- 
cgit v1.1


From 9c3fb16e3a90d57ec527d90ae26e686b893e75c7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Oct 2009 12:27:10 -0700
Subject: Fixed money change notification happening after logout/login

---
 linden/indra/newview/llviewermessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index c9e0f7f..88f6b36 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -4419,7 +4419,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 	LLUUID tid;
 	msg->getUUID("MoneyData", "TransactionID", tid);
 	static std::deque<LLUUID> recent;
-	if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange")
+	if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange") && !gDisconnected
 	   && (std::find(recent.rbegin(), recent.rend(), tid) == recent.rend()))
 	{
 		// Make the user confirm the transaction, since they might
-- 
cgit v1.1