From e45389e64a42f9176b6dce5f78b23c8423975792 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 11:29:22 -0700
Subject: Parcel highlighting when selecting a name in radar is less buggy

---
 linden/indra/newview/llfloatermap.cpp    | 19 ++++++++++---------
 linden/indra/newview/llfloatermap.h      |  6 +++---
 linden/indra/newview/llviewermessage.cpp |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 49563a6..256c52e 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -290,14 +290,14 @@ void LLFloaterMap::populateRadar()
 				{
 					if (distance < 20.0f)
 					{
-						if (!getInChatList(avatar_ids[i]))
+						if (!isInChatList(avatar_ids[i]))
 						{
 							addToChatList(avatar_ids[i], dist_string);
 						}
 					}
 					else
 					{
-						if (getInChatList(avatar_ids[i]))
+						if (isInChatList(avatar_ids[i]))
 						{
 							removeFromChatList(avatar_ids[i]);
 						}
@@ -311,7 +311,7 @@ void LLFloaterMap::populateRadar()
 
 				if (notify_sim)
 				{
-					if (!getInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
+					if (!isInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
 					{
 						LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
 						if (av_obj != NULL && av_obj->isAvatar())
@@ -338,7 +338,7 @@ void LLFloaterMap::populateRadar()
 				{
 					// append typing string
 					std::string typing = "";
-					if (getIsTyping(avatar_ids[i]))
+					if (isTyping(avatar_ids[i]))
 					{
 						typing = getString("is_typing")+ " ";
 					}
@@ -397,7 +397,7 @@ void LLFloaterMap::updateChatList(std::vector<LLUUID> agent_ids)
 	}
 }
 
-bool LLFloaterMap::getInChatList(LLUUID agent_id)
+bool LLFloaterMap::isInChatList(LLUUID agent_id)
 {
 	if (mChatAvatars.count(agent_id) > 0)
 	{
@@ -426,7 +426,7 @@ void LLFloaterMap::removeFromChatList(LLUUID agent_id)
 	mChatAvatars.erase(agent_id);
 }
 
-bool LLFloaterMap::getIsTyping(LLUUID agent_id)
+bool LLFloaterMap::isTyping(LLUUID agent_id)
 {
 	if (mTypingAvatars.count(agent_id) > 0)
 	{
@@ -439,7 +439,7 @@ void LLFloaterMap::updateTypingList(LLUUID agent_id, bool remove)
 {
 	if (remove)
 	{
-		if (getIsTyping(agent_id))
+		if (isTyping(agent_id))
 		{
 			mTypingAvatars.erase(agent_id);	
 		}
@@ -503,7 +503,7 @@ void LLFloaterMap::toggleButtons()
 		enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
 		enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
 		enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
-		enable_estate = getKickable(mSelectedAvatar);
+		enable_estate = isKickable(mSelectedAvatar);
 		enable_friend = !is_agent_friend(mSelectedAvatar);
 	}
 	else
@@ -552,7 +552,7 @@ void LLFloaterMap::toggleButtons()
 // [/RLVa:KB]
 }
 
-BOOL LLFloaterMap::getKickable(const LLUUID &agent_id)
+BOOL LLFloaterMap::isKickable(const LLUUID &agent_id)
 {
 	if (agent_id.notNull())
 	{
@@ -568,6 +568,7 @@ BOOL LLFloaterMap::getKickable(const LLUUID &agent_id)
 				if (LLWorld::getInstance()->positionRegionValidGlobal(pos_global))
 				{
 					LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos_global)->getParcel();
+					LLViewerParcelMgr::getInstance()->deselectLand();
 					
 					BOOL new_value = (region != NULL);
 								
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index af4d1cc..aedbcb8 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -52,7 +52,7 @@ 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);
+	bool isTyping(LLUUID agent_id);
 	void updateTypingList(LLUUID agent_id, bool remove);
 
 	BOOL postBuild();
@@ -85,12 +85,12 @@ private:
 	static void onList(LLUICtrl* ctrl, void* user_data);
 	static void onRangeChange(LLFocusableElement* focus, void* user_data);
 	BOOL visibleItemsSelected() const;
-	BOOL getKickable(const LLUUID &agent_id);
+	BOOL isKickable(const LLUUID &agent_id);
 	void toggleButtons();
 	void populateRadar();
 
 	void updateChatList(std::vector<LLUUID> agent_ids);
-	bool getInChatList(LLUUID agent_id);
+	bool isInChatList(LLUUID agent_id);
 	void addToChatList(LLUUID agent_id, std::string distance);
 	void removeFromChatList(LLUUID agent_id);
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index d784f52..3baeec0 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2574,7 +2574,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 			if (LLFloaterMap::getInstance())
 			{
-				if (LLFloaterMap::getInstance()->getIsTyping(from_id))
+				if (LLFloaterMap::getInstance()->isTyping(from_id))
 				{
 					LLFloaterMap::getInstance()->updateTypingList(from_id, true);
 				}
-- 
cgit v1.1


From c48fd00d2069a48478f4fa5da8c303444a409cfe Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 11:46:35 -0700
Subject: Combine the two mini-map mute buttons into one

---
 linden/indra/newview/llfloatermap.cpp                       | 13 ++++++++++++-
 .../newview/skins/default/xui/en-us/floater_mini_map.xml    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 256c52e..31e57a0 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -520,10 +520,21 @@ void LLFloaterMap::toggleButtons()
 	childSetEnabled("freeze_btn", enable_estate);
 	childSetEnabled("eject_btn", enable_estate);
 	childSetEnabled("mute_btn", enable);
-	childSetEnabled("unmute_btn", enable_unmute);
 	childSetEnabled("ar_btn", enable);
 	childSetEnabled("estate_eject_btn", enable_estate);
 
+	if (enable_unmute)
+	{
+		childSetVisible("mute_btn", false);
+		childSetEnabled("unmute_btn", true);
+		childSetVisible("unmute_btn", true);
+	}
+	else
+	{
+		childSetVisible("mute_btn", true);
+		childSetVisible("unmute_btn", false);
+	}
+
 // [RLVa:KB] - Imprudence-1.2.0
 	// Bit clumsy, but this way the RLV stuff is in its own separate block and keeps the code above clean - Kitty
 	if ( (rlv_handler_t::isEnabled()) && (mSelectedAvatar.notNull()) )
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 3c860e9..57f955f 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
@@ -70,7 +70,7 @@
         <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
              left_delta="0" name="mute_btn"
              tool_tip="" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Unmute..."
+        <button bottom_delta="0" follows="top|right" height="22" label="Unmute..."
              left_delta="0" name="unmute_btn"
              tool_tip="" width="80" />
         <button bottom_delta="-25" follows="top|right" height="22" label="Report..."
-- 
cgit v1.1


From 7e75c13e0ea967de1fd1f5531b30d2eab7917ae8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 14 Oct 2009 02:38:26 -0700
Subject: Applied patch for VWR-6787 by Alissa Sabre - 'none' text in group
 window not translatable

---
 linden/indra/newview/llfloatergroups.cpp                  | 15 +++++++++------
 .../newview/skins/default/xui/de/floater_choose_group.xml |  3 +++
 .../indra/newview/skins/default/xui/de/panel_groups.xml   |  3 +++
 .../skins/default/xui/en-us/floater_choose_group.xml      |  3 +++
 .../newview/skins/default/xui/en-us/panel_groups.xml      |  3 +++
 .../newview/skins/default/xui/ja/floater_choose_group.xml |  3 +++
 .../indra/newview/skins/default/xui/ja/panel_groups.xml   |  3 +++
 .../newview/skins/default/xui/ko/floater_choose_group.xml |  3 +++
 .../indra/newview/skins/default/xui/ko/panel_groups.xml   |  3 +++
 9 files changed, 33 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 23e2f4d..9599089 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -61,7 +61,7 @@
 std::map<const LLUUID, LLFloaterGroupPicker*> LLFloaterGroupPicker::sInstances;
 
 // helper functions
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask = GP_ALL_POWERS);
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, const std::string& none_text, U64 powers_mask = GP_ALL_POWERS);
 
 ///----------------------------------------------------------------------------
 /// Class LLFloaterGroupPicker
@@ -116,7 +116,8 @@ void LLFloaterGroupPicker::setPowersMask(U64 powers_mask)
 
 BOOL LLFloaterGroupPicker::postBuild()
 {
-	init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), mPowersMask);
+	const std::string none_text = getString("none");
+	init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text, mPowersMask);
 
 	childSetAction("OK", onBtnOK, this);
 
@@ -200,7 +201,8 @@ void LLPanelGroups::reset()
 	childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
 	childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
 
-	init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
+	const std::string none_text = getString("none");
+	init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
 	enableButtons();
 }
 
@@ -211,7 +213,8 @@ BOOL LLPanelGroups::postBuild()
 	childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
 	childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
 
-	init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
+	const std::string none_text = getString("none");
+	init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
 
 	childSetAction("Activate", onBtnActivate, this);
 
@@ -457,7 +460,7 @@ void LLPanelGroups::onGroupList(LLUICtrl* ctrl, void* userdata)
 	if(self) self->enableButtons();
 }
 
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask)
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, const std::string& none_text, U64 powers_mask)
 {
 	S32 count = gAgent.mGroups.count();
 	LLUUID id;
@@ -499,7 +502,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
 		LLSD element;
 		element["id"] = LLUUID::null;
 		element["columns"][0]["column"] = "name";
-		element["columns"][0]["value"] = "none"; // *TODO: Translate
+		element["columns"][0]["value"] = none_text;
 		element["columns"][0]["font"] = "SANSSERIF";
 		element["columns"][0]["font-style"] = style;
 
diff --git a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
index dd29aa7..327cb02 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
@@ -5,4 +5,7 @@
 	</text>
 	<button label="OK" label_selected="OK" name="OK" />
 	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+  <string name="none">
+    keine
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_groups.xml b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
index 95a2ef1..a7d6f98 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
@@ -12,4 +12,7 @@
 	<button label="Verlassen" name="Leave" />
 	<button label="Erstellen..." name="Create" />
 	<button label="Suchen..." name="Search..." />
+  <string name="none">
+		keine
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
index 02001e9..f438262 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
@@ -18,4 +18,7 @@
 	<button bottom="-236" font="SansSerif" halign="center" height="20" label="Cancel"
 	     label_selected="Cancel" left_delta="88" mouse_opaque="true" name="Cancel"
 	     width="80" />
+  <string name="none">
+    none
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index c47985b..0bc7866 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -36,4 +36,7 @@
 	     label="Search..." name="Search..." width="80" />
 	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
 	     label="Leave" name="Leave" width="80" />
+  <string name="none">
+		none
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 08c91f1..0e3153c 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -5,4 +5,7 @@
 	</text>
 	<button label="OK" label_selected="OK" name="OK" />
 	<button label="取り消し" label_selected="取り消し" name="Cancel" />
+  <string name="none">
+		グループなし
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index 785fd86..adfdcd4 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -13,4 +13,7 @@
 	<button label="抜ける" name="Leave" />
 	<button label="作成..." name="Create" />
 	<button label="検索..." name="Search..." />
+  <string name="none">
+		グループなし
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
index 2cb821a..53bb889 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
@@ -5,4 +5,7 @@
 	</text>
 	<button label="확인" label_selected="확인" name="OK" />
 	<button label="취소" label_selected="취소" name="Cancel" />
+  <string name="none">
+		그룹 없음
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
index cdd28a6..8e66006 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
@@ -13,4 +13,7 @@
 	<button label="탈퇴" name="Leave" width="90"/>
 	<button label="만들기" name="Create" width="90"/>
 	<button label="검색" name="Search..." width="90"/>
+  <string name="none">
+		그룹 없음
+  </string>
 </panel>
-- 
cgit v1.1


From ce82adec2a0124fe27f363653d2652b0f5c61f04 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 16 Oct 2009 16:39:44 -0700
Subject: Applied RLVa-1.0.4e_20091010_SL-1.22.11-diff.patch

---
 linden/indra/newview/app_settings/settings.xml |   2 +-
 linden/indra/newview/llagent.cpp               |   4 +-
 linden/indra/newview/llchatbar.cpp             |  18 ++--
 linden/indra/newview/llinventorybridge.cpp     |   2 +-
 linden/indra/newview/llpanelinventory.cpp      |   2 +-
 linden/indra/newview/llviewermenu.cpp          |   2 +-
 linden/indra/newview/llviewermessage.cpp       |   9 +-
 linden/indra/newview/llviewertexteditor.cpp    |   2 +-
 linden/indra/newview/rlvdefines.h              |  17 +++-
 linden/indra/newview/rlvextensions.cpp         |  34 ++++++-
 linden/indra/newview/rlvextensions.h           |   2 +
 linden/indra/newview/rlvhandler.cpp            | 122 ++++++++++++++++++-------
 linden/indra/newview/rlvhandler.h              | 108 +++++++++-------------
 linden/indra/newview/rlvhelper.cpp             |  67 +++++++-------
 linden/indra/newview/rlvhelper.h               |  55 ++++++++++-
 15 files changed, 285 insertions(+), 161 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 55e6131..15bb319 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -65,7 +65,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>0</integer>
+    <integer>1</integer>
   </map>
   <key>RLVaHideLockedLayers</key>
   <map>
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 022e1cc..8b118e0 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -5991,7 +5991,7 @@ void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
 {
 // [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
 	if ( (rlv_handler_t::isEnabled()) &&
-		 ( (gRlvHandler.hasBehaviour("tplm")) || 
+		 ( (gRlvHandler.hasBehaviour(RLV_BHVR_TPLM)) || 
 		   ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting)) ))
 	{
 		return;
@@ -6065,7 +6065,7 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
 // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-07 (RLVa-1.0.0d)
 	// If we're getting teleported due to @tpto we should disregard any @tploc=n or @unsit=n restrictions from the same object
 	if ( (rlv_handler_t::isEnabled()) &&
-		 ( (gRlvHandler.hasBehaviourExcept("tploc", gRlvHandler.getCurrentObject())) ||
+		 ( (gRlvHandler.hasBehaviourExcept(RLV_BHVR_TPLOC, gRlvHandler.getCurrentObject())) ||
 		   ( (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) && 
 			 (gRlvHandler.hasBehaviourExcept(RLV_BHVR_UNSIT, gRlvHandler.getCurrentObject()))) ) )
 	{
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 608fb54..710677a 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -634,11 +634,11 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 	if ( (0 == channel) && (rlv_handler_t::isEnabled()) )
 	{
 		// Adjust the (public) chat "volume" on chat and gestures (also takes care of playing the proper animation)
-		if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour("chatnormal")) )
+		if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATNORMAL)) )
 			type = CHAT_TYPE_WHISPER;
-		else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour("chatshout")) )
+		else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATSHOUT)) )
 			type = CHAT_TYPE_NORMAL;
-		else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour("chatwhisper")) )
+		else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
 			type = CHAT_TYPE_NORMAL;
 
 		animate &= !gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT);
@@ -692,11 +692,11 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
 		if (0 == channel)
 		{
 			// (We already did this before, but LLChatHandler::handle() calls this directly)
-			if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour("chatnormal")) )
+			if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATNORMAL)) )
 				type = CHAT_TYPE_WHISPER;
-			else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour("chatshout")) )
+			else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATSHOUT)) )
 				type = CHAT_TYPE_NORMAL;
-			else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour("chatwhisper")) )
+			else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
 				type = CHAT_TYPE_NORMAL;
 
 			// Redirect chat if needed
@@ -707,20 +707,20 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
 			}
 
 			// Filter public chat if sendchat restricted (and filter anything that redirchat didn't redirect)
-			if ( (gRlvHandler.hasBehaviour("sendchat")) || (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
+			if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHAT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
 				gRlvHandler.filterChat(utf8_out_text, true);
 		}
 		else
 		{
 			// Don't allow chat on a non-public channel if sendchannel restricted (unless the channel is an exception)
-			if ( (gRlvHandler.hasBehaviour("sendchannel")) && (!gRlvHandler.hasBehaviour("sendchannel", llformat("%d", channel))) )
+			if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHANNEL)) && (!gRlvHandler.isException(RLV_BHVR_SENDCHANNEL, channel)) )
 				return;
 
 			// Don't allow chat on debug channel if @sendchat, @redirchat or @rediremote restricted (shows as public chat on viewers)
 			if (channel >= CHAT_CHANNEL_DEBUG)
 			{
 				bool fIsEmote = rlvIsEmote(utf8_out_text);
-				if ( (gRlvHandler.hasBehaviour("sendchat")) || 
+				if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHAT)) || 
 					 ((!fIsEmote) && (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT))) || 
 					 ((fIsEmote) && (gRlvHandler.hasBehaviour(RLV_BHVR_REDIREMOTE))) )
 				{
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 0d5625c..5060d21 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -2943,7 +2943,7 @@ void open_notecard(LLViewerInventoryItem* inv_item,
 				   BOOL take_focus)
 {
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-	if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour("viewnote")) )
+	if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
 	{
 		return;
 	}
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 7ab850f..0ae2aec 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -1377,7 +1377,7 @@ void LLTaskNotecardBridge::openItem()
 		return;
 	}
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-	if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour("viewnote")) || (!gRlvHandler.isDetachable(object))) )
+	if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) || (!gRlvHandler.isDetachable(object))) )
 	{
 		return;
 	}
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index ceb5d5f..4493ddf 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1423,7 +1423,7 @@ void init_debug_rlva_menu(LLMenuGL* menu)
 
 	#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->append(new LLMenuItemCheckGL("Enable Wear", menu_toggle_control, rlvEnableWearEnabler, menu_check_control, (void*)RLV_SETTING_ENABLEWEAR));
 		menu->appendSeparator();
 	#endif // RLV_EXTENSION_ENABLE_WEAR
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 3baeec0..c403e3e 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2485,7 +2485,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		color.setVec(1.f,1.f,1.f,1.f);
 		msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
 
-// [RLVa:KB] - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+// [RLVa:KB] - Checked: 2009-10-06 (RLVa-1.0.4d) | Modified: RLVa-1.0.4d
 		if ( (rlv_handler_t::isEnabled()) && 
 			 (CHAT_TYPE_START != chat.mChatType) && (CHAT_TYPE_STOP != chat.mChatType) && (CHAT_TYPE_OWNER != chat.mChatType) )
 		{
@@ -2495,7 +2495,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			// Filtering "rules":
 			//   avatar  => filter all avie text (unless it's this avie or they're an exemption)
 			//   objects => filter everything except attachments this avie owns
-			if ( ((CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID())) || (!is_owned_by_me) || (!is_attachment) )
+			if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) || 
+				 ( (CHAT_SOURCE_OBJECT == chat.mSourceType) && ((!is_owned_by_me) || (!is_attachment)) ) )
 			{
 				if (!rlvIsEmote(mesg))
 				{
@@ -4933,7 +4934,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0e
 		S32 rlvQuestionsOther = questions;
 
-		if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour("acceptpermission")) )
+		if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTPERMISSION)) )
 		{
 			LLViewerObject* pObj = gObjectList.findObject(taskid);
 			if (pObj)
@@ -5308,7 +5309,7 @@ void handle_lure(LLDynamicArray<LLUUID>& ids)
 		for (LLDynamicArray<LLUUID>::iterator it = ids.begin(); it != ids.end(); ++it)
 		{
 			const LLRelationship* pBuddyInfo = LLAvatarTracker::instance().getBuddyInfo(*it);
-			if ( (!gRlvHandler.isException(RLV_BHVR_TPLURE, *it)) &&
+			if ( (!gRlvHandler.isException(RLV_BHVR_TPLURE, *it, RLV_CHECK_PERMISSIVE)) &&
 				 ((!pBuddyInfo) || (!pBuddyInfo->isOnline()) || (!pBuddyInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION))) )
 			{
 				delete userdata;
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 76b752c..8f4a944 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -96,7 +96,7 @@ public:
 		else
 		{
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-			if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour("viewnote")) )
+			if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
 			{
 				return;
 			}
diff --git a/linden/indra/newview/rlvdefines.h b/linden/indra/newview/rlvdefines.h
index 4e6a4d4..d1e0b75 100644
--- a/linden/indra/newview/rlvdefines.h
+++ b/linden/indra/newview/rlvdefines.h
@@ -41,13 +41,14 @@
 
 // Version of the specifcation we support
 const S32 RLV_VERSION_MAJOR = 1;
-const S32 RLV_VERSION_MINOR = 20;
-const S32 RLV_VERSION_PATCH = 2;
+const S32 RLV_VERSION_MINOR = 21;
+const S32 RLV_VERSION_PATCH = 0;
+const S32 RLV_VERSION_BUILD = 0;
 
 // Implementation version
 const S32 RLVa_VERSION_MAJOR = 1;
 const S32 RLVa_VERSION_MINOR = 0;
-const S32 RLVa_VERSION_PATCH = 3;
+const S32 RLVa_VERSION_PATCH = 4;
 const S32 RLVa_VERSION_BUILD = 4;
 
 // The official viewer version we're patching against
@@ -136,6 +137,7 @@ enum ERlvBehaviour {
 	RLV_BHVR_SHOWLOC,				// "showloc"
 	RLV_BHVR_TPTO,					// "tpto"
 	RLV_BHVR_ACCEPTTP,				// "accepttp"
+	RLV_BHVR_ACCEPTPERMISSION,		// "acceptpermission"
 	RLV_BHVR_SHOWNAMES,				// "shownames"
 	RLV_BHVR_FLY,					// "fly"
 	RLV_BHVR_GETSITID,				// "getsitid"
@@ -147,6 +149,9 @@ enum ERlvBehaviour {
 	RLV_BHVR_SHOWHOVERTEXTHUD,		// "showhovertexthud"
 	RLV_BHVR_SHOWHOVERTEXT,			// "showhovertext"
 	RLV_BHVR_NOTIFY,				// "notify"
+	RLV_BHVR_DEFAULTWEAR,			// "defaultwear"
+	RLV_BHVR_VERSIONNUM,			// "versionnum"
+	RLV_BHVR_PERMISSIVE,			// "permissive"
 
 	RLV_BHVR_COUNT,
 	RLV_BHVR_UNKNOWN
@@ -174,6 +179,12 @@ enum ERlvCmdRet {
 	RLV_RET_UNKNOWN					// Command unkown
 };
 
+enum ERlvExceptionCheck {
+	RLV_CHECK_PERMISSIVE,			// Exception can be set by any object
+	RLV_CHECK_STRICT,				// Exception must be set by all objects holding the restriction
+	RLV_CHECK_DEFAULT				// Permissive or strict will be determined by currently enforced restrictions
+};
+
 // ============================================================================
 // Settings
 
diff --git a/linden/indra/newview/rlvextensions.cpp b/linden/indra/newview/rlvextensions.cpp
index 10d1c46..f31c62e 100644
--- a/linden/indra/newview/rlvextensions.cpp
+++ b/linden/indra/newview/rlvextensions.cpp
@@ -12,13 +12,14 @@
 // ============================================================================
 
 std::map<std::string, S16> RlvExtGetSet::m_DbgAllowed;
+std::map<std::string, std::string> RlvExtGetSet::m_PseudoDebug;
 
 // Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
 RlvExtGetSet::RlvExtGetSet()
 {
 	if (!m_DbgAllowed.size())	// m_DbgAllowed is static and should only be initialized once
 	{
-		m_DbgAllowed.insert(std::pair<std::string, S16>("AvatarSex", DBG_READ | DBG_PSEUDO));
+		m_DbgAllowed.insert(std::pair<std::string, S16>("AvatarSex", DBG_READ | DBG_WRITE | DBG_PSEUDO));
 		m_DbgAllowed.insert(std::pair<std::string, S16>("RenderResolutionDivisor", DBG_READ | DBG_WRITE));
 		#ifdef RLV_EXTENSION_CMD_GETSETDEBUG_EX
 			m_DbgAllowed.insert(std::pair<std::string, S16>(RLV_SETTING_FORBIDGIVETORLV, DBG_READ));
@@ -172,19 +173,27 @@ std::string RlvExtGetSet::onGetDebug(std::string strSetting)
 	return std::string();
 }
 
-// Checked: 2009-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
+// Checked: 2009-10-03 (RLVa-1.0.4e) | Added: RLVa-1.0.4e
 std::string RlvExtGetSet::onGetPseudoDebug(const std::string& strSetting)
 {
 	// Skip sanity checking because it's all done in RlvExtGetSet::onGetDebug() already
 	if ("AvatarSex" == strSetting)
 	{
-		if (gAgent.getAvatarObject())
-			return llformat("%d", (gAgent.getAvatarObject()->getSex() == SEX_MALE)); // [See LLFloaterCustomize::LLFloaterCustomize()]
+		std::map<std::string, std::string>::const_iterator itPseudo = m_PseudoDebug.find(strSetting);
+		if (itPseudo != m_PseudoDebug.end())
+		{
+			return itPseudo->second;
+		}
+		else
+		{
+			if (gAgent.getAvatarObject())
+				return llformat("%d", (gAgent.getAvatarObject()->getSex() == SEX_MALE)); // [See LLFloaterCustomize::LLFloaterCustomize()]
+		}
 	}
 	return std::string();
 }
 
-// Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
+// Checked: 2009-10-10 (RLVa-1.0.4e) | Modified: RLVa-1.0.4e
 void RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValue)
 {
 	S16 dbgFlags;
@@ -219,6 +228,21 @@ void RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValu
 				pSetting->setPersist( (pSetting->isDefault()) ? ((dbgFlags & DBG_PERSIST) == DBG_PERSIST) : false );
 			}
 		}
+		else
+		{
+			onSetPseudoDebug(strSetting, strValue);
+		}
+	}
+}
+
+// Checked: 2009-10-10 (RLVa-1.0.4e) | Modified: RLVa-1.0.4e
+void RlvExtGetSet::onSetPseudoDebug(const std::string& strSetting, const std::string& strValue)
+{
+	if ("AvatarSex" == strSetting)
+	{
+		BOOL fValue;
+		if (LLStringUtil::convertToBOOL(strValue, fValue))
+			m_PseudoDebug[strSetting] = strValue;
 	}
 }
 
diff --git a/linden/indra/newview/rlvextensions.h b/linden/indra/newview/rlvextensions.h
index 5c10c58..5720ba0 100644
--- a/linden/indra/newview/rlvextensions.h
+++ b/linden/indra/newview/rlvextensions.h
@@ -24,6 +24,7 @@ protected:
 	std::string onGetDebug(std::string strSetting);
 	std::string onGetPseudoDebug(const std::string& strSetting);
 	void        onSetDebug(std::string strSetting, const std::string& strValue);
+	void        onSetPseudoDebug(const std::string& strSetting, const std::string& strValue);
 
 	std::string onGetEnv(std::string strSetting);
 	void        onSetEnv(std::string strSetting, const std::string& strValue);
@@ -33,6 +34,7 @@ protected:
 public:
 	enum { DBG_READ = 0x01, DBG_WRITE = 0x02, DBG_PERSIST = 0x04, DBG_PSEUDO = 0x08 };
 	static std::map<std::string, S16> m_DbgAllowed;
+	static std::map<std::string, std::string> m_PseudoDebug;
 
 	static bool findDebugSetting(/*[in,out]*/ std::string& strSetting, /*[out]*/ S16& flags);
 	static S16  getDebugSettingFlags(const std::string& strSetting);
diff --git a/linden/indra/newview/rlvhandler.cpp b/linden/indra/newview/rlvhandler.cpp
index 6044aa9..69e2e2f 100644
--- a/linden/indra/newview/rlvhandler.cpp
+++ b/linden/indra/newview/rlvhandler.cpp
@@ -286,7 +286,7 @@ bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDe
 	if (!fDetachable)
 	{
 		#ifdef RLV_EXPERIMENTAL_FIRSTUSE
-			LLFirstUse::useRlvDetach();
+			//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)
@@ -338,27 +338,47 @@ bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDe
 // Behaviour related functions
 //
 
-bool RlvHandler::hasBehaviourExcept(const std::string& strBehaviour, const LLUUID& idObj) const
-{
-	for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
-		if ( (idObj != itObj->second.m_UUID) && (itObj->second.hasBehaviour(strBehaviour)) )
-			return true;
-	return false;
-}
-
 bool RlvHandler::hasBehaviourExcept(ERlvBehaviour eBehaviour, const std::string& strOption, const LLUUID& idObj) const
 {
 	for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
-		if ( (idObj != itObj->second.m_UUID) && (itObj->second.hasBehaviour(eBehaviour, strOption)) )
+		if ( (idObj != itObj->second.m_UUID) && (itObj->second.hasBehaviour(eBehaviour, strOption, false)) )
 			return true;
 	return false;
 }
 
-bool RlvHandler::hasBehaviourExcept(const std::string& strBehaviour, const std::string& strOption, const LLUUID& idObj) const
+// Checked: 2009-10-04 (RLVa-1.0.4c) | Modified: RLVa-1.0.4c
+bool RlvHandler::isException(ERlvBehaviour eBhvr, const RlvExceptionOption& varOption, ERlvExceptionCheck typeCheck) const
 {
-	for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
-		if ( (idObj != itObj->second.m_UUID) && (itObj->second.hasBehaviour(strBehaviour, strOption)) )
-			return true;
+	// We need to "strict check" exceptions only if: the restriction is actually in place *and* (isPermissive(eBhvr) == FALSE)
+	if (RLV_CHECK_DEFAULT == typeCheck)
+		typeCheck = ( (hasBehaviour(eBhvr)) && (!isPermissive(eBhvr)) ) ? RLV_CHECK_STRICT : RLV_CHECK_PERMISSIVE;
+
+	std::list<LLUUID> objList;
+	if (RLV_CHECK_STRICT == typeCheck)
+	{
+		// If we're "strict checking" then we need the UUID of every object that currently has 'eBhvr' restricted
+		for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+			if (itObj->second.hasBehaviour(eBhvr, !hasBehaviour(RLV_BHVR_PERMISSIVE)))
+				objList.push_back(itObj->first);
+	}
+
+	for (rlv_exception_map_t::const_iterator itException = m_Exceptions.lower_bound(eBhvr), 
+			endException = m_Exceptions.upper_bound(eBhvr); itException != endException; ++itException)
+	{
+		if (itException->second.varOption == varOption)
+		{
+			// For permissive checks we just return on the very first match
+			if (RLV_CHECK_PERMISSIVE == typeCheck)
+				return true;
+
+			// For strict checks we don't return until the list is empty (every object with 'eBhvr' restricted also contains the exception)
+			std::list<LLUUID>::iterator itList = std::find(objList.begin(), objList.end(), itException->second.idObject);
+			if (itList != objList.end())
+				objList.erase(itList);
+			if (objList.empty())
+				return true;
+		}
+	}
 	return false;
 }
 
@@ -509,7 +529,11 @@ BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
 	const std::string& strOption = rlvCmd.getOption();
 
 	if ( (RLV_BHVR_UNKNOWN != eBehaviour) && (strOption.empty()) )
+	{
+		if (rlvCmd.isStrict())
+			addException(uuid, RLV_BHVR_PERMISSIVE, eBehaviour);
 		m_Behaviours[eBehaviour]++;
+	}
 
 	switch (eBehaviour)
 	{
@@ -649,7 +673,7 @@ BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
 		case RLV_BHVR_FARTOUCH:
 			{
 				#ifdef RLV_EXPERIMENTAL_FIRSTUSE
-					LLFirstUse::useRlvFartouch();
+					//LLFirstUse::useRlvFartouch();
 				#endif // RLV_EXPERIMENTAL_FIRSTUSE
 			}
 			break;
@@ -695,9 +719,9 @@ BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
 		case RLV_BHVR_SHOWHOVERTEXT:		// @showhovertext:<uuid>=n	- Checked: 2009-07-09 (RLVa-0.2.2a) | Modified: RLVa-1.0.0f
 			{
 				LLUUID idException(strOption);
-				if (!idException.isNull())	// If there's an option it should be a valid UUID
+				if (idException.notNull())	// If there's an option it should be a valid UUID
 				{
-					addException(eBehaviour, LLUUID(strOption));
+					addException(uuid, eBehaviour, idException);
 
 					// Clear the object's hover text
 					LLViewerObject* pObj = gObjectList.findObject(idException);
@@ -717,6 +741,13 @@ BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
 				}
 			}
 			break;
+		case RLV_BHVR_SENDCHANNEL:			// @sendchannel:<uuid>=add	- Checked: 2009-10-05 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+			{
+				S32 nChannel;	// If there's an option it should be a valid (=positive and non-zero) chat channel
+				if ( (!strOption.empty()) && (LLStringUtil::convertToS32(strOption, nChannel)) && (nChannel > 0) )
+					addException(uuid, eBehaviour, nChannel);
+			}
+			break;
 		case RLV_BHVR_RECVCHAT:				// @recvchat:<uuid>=add		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 		case RLV_BHVR_RECVEMOTE:			// @recvemote:<uuid>=add	- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 		case RLV_BHVR_RECVIM:				// @recvim:<uuid>=add		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
@@ -724,16 +755,20 @@ BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
 		case RLV_BHVR_TPLURE:				// @tplure:<uuid>=add		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 		case RLV_BHVR_ACCEPTTP:				// @accepttp:<uuid>=add		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 			{
-				addException(eBehaviour, LLUUID(strOption));
+				LLUUID idException(strOption);
+				if (idException.notNull())	// If there's an option it should be a valid UUID
+					addException(uuid, eBehaviour, LLUUID(strOption));
 			}
 			break;
-		default:
+		case RLV_BHVR_UNKNOWN:
 			{
 				// Give our observers a chance to handle any command we don't
 				RlvEvent rlvEvent(uuid, rlvCmd);
 				m_Emitter.update(&RlvObserver::onAddCommand, rlvEvent);
 			}
 			break;
+		default:
+			break;
 	}
 	return TRUE; // Add command success/failure is decided by RlvObject::addCommand()
 }
@@ -756,7 +791,11 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
 	const std::string& strOption = rlvCmd.getOption();
 
 	if ( (RLV_BHVR_UNKNOWN != eBehaviour) && (strOption.empty()) )
+	{
+		if (rlvCmd.isStrict())
+			removeException(uuid, RLV_BHVR_PERMISSIVE, eBehaviour);
 		m_Behaviours[eBehaviour]--;
+	}
 
 	switch (eBehaviour)
 	{
@@ -842,9 +881,9 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
 		case RLV_BHVR_SHOWHOVERTEXT:		// @showhovertext:<uuid>=y	- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 			{
 				LLUUID idException(strOption);
-				if (!idException.isNull())	// If there's an option it should be a valid UUID
+				if (idException.notNull())	// If there's an option it should be a valid UUID
 				{
-					removeException(eBehaviour, LLUUID(strOption));
+					removeException(uuid, eBehaviour, idException);
 
 					// Restore the object's hover text
 					LLViewerObject* pObj = gObjectList.findObject(idException);
@@ -869,6 +908,13 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
 				}
 			}
 			break;
+		case RLV_BHVR_SENDCHANNEL:			// @sendchannel:<uuid>=rem	- Checked: 2009-10-05 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+			{
+				S32 nChannel;	// If there's an option it should be a valid (=positive and non-zero) chat channel
+				if ( (!strOption.empty()) && (LLStringUtil::convertToS32(strOption, nChannel)) && (nChannel > 0) )
+					removeException(uuid, eBehaviour, nChannel);
+			}
+			break;
 		case RLV_BHVR_RECVCHAT:				// @recvchat:<uuid>=rem		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 		case RLV_BHVR_RECVEMOTE:			// @recvemote:<uui>=red		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 		case RLV_BHVR_RECVIM:				// @recvim:<uuid>=rem		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
@@ -876,16 +922,20 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
 		case RLV_BHVR_TPLURE:				// @recvim:<uuid>=rem		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 		case RLV_BHVR_ACCEPTTP:				// @accepttp:<uuid>=rem		- Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
 			{
-				removeException(eBehaviour, LLUUID(strOption));
+				LLUUID idException(strOption);
+				if (idException.notNull())	// If there's an option it should be a valid UUID
+					removeException(uuid, eBehaviour, LLUUID(strOption));
 			}
 			break;
-		default:
+		case RLV_BHVR_UNKNOWN:
 			{
 				// Give our observers a chance to handle any command we don't
 				RlvEvent rlvEvent(uuid, rlvCmd);
 				m_Emitter.update(&RlvObserver::onRemoveCommand, rlvEvent);
 			}
 			break;
+		default:
+			break;
 	}
 	return TRUE; // Remove commands don't fail, doesn't matter what we return here
 }
@@ -1006,13 +1056,15 @@ BOOL RlvHandler::processForceCommand(const LLUUID& idObj, const RlvCommand& rlvC
 				}
 			}
 			break;
-		default:
+		case RLV_BHVR_UNKNOWN:
 			{
 				// Give our observers a chance to handle any command we don't
 				RlvEvent rlvEvent(idObj, rlvCmd);
 				fHandled = m_Emitter.update(&RlvObserver::onForceCommand, rlvEvent);
 			}
 			break;
+		default:
+			break;
 	}
 	return fHandled; // If we handled it then it'll still be TRUE; if an observer doesn't handle it'll be FALSE
 }
@@ -1030,6 +1082,9 @@ BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCm
 		case RLV_BHVR_VERSION:			// @version=<channel>				  - Checked: 2009-07-12 (RLVa-1.0.0h)
 			strReply = getVersionString();
 			break;
+		case RLV_BHVR_VERSIONNUM:		// @versionnum=<channel>			  - Checked: 2009-10-04 (RLVa-1.0.4b) | Added: RLVa-1.0.4b
+			strReply = getVersionNumString();
+			break;
 		case RLV_BHVR_GETOUTFIT:		// @getoufit[:<layer>]=<channel>	  - Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
 			{
 				// (Quirk: RLV 1.16.1 will execute @getoutfit=<channel> if <layer> is invalid, so we need to as well)
@@ -1225,13 +1280,15 @@ BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCm
 				strReply = uuid.asString();
 			}
 			break;
-		default:
+		case RLV_BHVR_UNKNOWN:
 			{
 				// Give our observers a chance to handle any command we don't
 				RlvEvent rlvEvent(uuid, rlvCmd);
 				return m_Emitter.update(&RlvObserver::onReplyCommand, rlvEvent);
 			}
 			break;
+		default:
+			break;
 	}
 
 	if (fHandled)
@@ -1318,7 +1375,7 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
 			itObj->second.m_fLookup = true;
 
 		// In both cases we should check for "@detach=n" and actually lock down the attachment point it got attached to
-		if (itObj->second.hasBehaviour(RLV_BHVR_DETACH))
+		if (itObj->second.hasBehaviour(RLV_BHVR_DETACH, false))
 		{
 			// (Copy/paste from processAddCommand)
 			setDetachable(idxAttachPt, pObj->getID(), false);
@@ -1569,7 +1626,7 @@ void RlvHandler::filterChat(std::string& strUTF8Text, bool fFilterEmote) const
 			{
 				strUTF8Text = "...";				// Emote contains illegal character (or character sequence)
 			}
-			else if (!hasBehaviour("emote"))
+			else if (!hasBehaviour(RLV_BHVR_EMOTE))
 			{
 				int idx = strUTF8Text.find('.');	// Truncate at 20 characters or at the dot (whichever is shorter)
 				strUTF8Text = utf8str_chtruncate(strUTF8Text, ( (idx > 0) && (idx < 20) ) ? idx + 1 : 20);
@@ -1674,17 +1731,18 @@ bool RlvHandler::redirectChatOrEmote(const std::string& strUTF8Text) const
 			return false;	// @sendchat wouldn't filter it so @redirchat won't redirect it either
 	}
 
-	bool fSendChannel = hasBehaviour("sendchannel");
+	bool fSendChannel = hasBehaviour(RLV_BHVR_SENDCHANNEL); S32 nChannel = 0;
 	for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
 	{
 		for (rlv_command_list_t::const_iterator itCmd = itObj->second.m_Commands.begin(), 
 				endCmd = itObj->second.m_Commands.end(); itCmd != endCmd; ++itCmd)
 		{
-			if ( ( ((!fIsEmote) && (RLV_BHVR_REDIRCHAT == itCmd->getBehaviourType())) ||
-				   ((fIsEmote) && (RLV_BHVR_REDIREMOTE == itCmd->getBehaviourType())) ) && 
-				 ( (!fSendChannel) || (hasBehaviour("sendchannel", itCmd->getOption())) ) )
+			if ( ( ((!fIsEmote) && (RLV_BHVR_REDIRCHAT == itCmd->getBehaviourType())) ||	// Redirect if: (not an emote and @redirchat
+				   ((fIsEmote) && (RLV_BHVR_REDIREMOTE == itCmd->getBehaviourType())) ) &&	// OR an emote and @rediremote)
+				 (LLStringUtil::convertToS32(itCmd->getOption(), nChannel)) &&				// AND the channel is a number
+				 ( (!fSendChannel) || (isException(RLV_BHVR_SENDCHANNEL, nChannel)) ) )		// AND we're allowed to send to that channel
 			{
-				rlvSendChatReply(itCmd->getOption(), strUTF8Text);
+				rlvSendChatReply(nChannel, strUTF8Text);
 			}
 		}
 	}
diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h
index 4470632..5295a72 100644
--- a/linden/indra/newview/rlvhandler.h
+++ b/linden/indra/newview/rlvhandler.h
@@ -18,7 +18,7 @@
 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::multimap<ERlvBehaviour, RlvException> rlv_exception_map_t;
 
 class RlvHandler
 {
@@ -29,7 +29,7 @@ public:
 	// --------------------------------
 
 	/*
-	 * Rule checking functions
+	 * Attachment point helper functions
 	 */
 public:
 	// Returns a pointer to the attachment point for a supplied parameter
@@ -42,45 +42,45 @@ public:
 	S32                      getAttachPointIndex(const LLViewerJointAttachment* pObj) const;
 	bool                     hasAttachPointName(const LLInventoryItem* pItem, bool fStrict) const;
 
-	// Returns TRUE is at least one object contains the specified behaviour (and optional parameter)
+	// --------------------------------
+
+	/*
+	 * Rule checking functions
+	 */
 	// NOTE: - to check @detach=n    -> hasLockedAttachment() / hasLockedHUD() / isDetachable()
+	//       - to check exceptions   -> isException()
 	//       - to check @addoutfit=n -> isWearable()
 	//       - to check @remoutfit=n -> isRemovable()
-	//       - to check exceptions   -> isException()
-	//  (You *can* use hasBehaviour(); the specialized ones just don't have to iterate over all the objects)
+public:
+	// Returns TRUE is at least one object contains the specified behaviour (and optional option)
 	bool hasBehaviour(ERlvBehaviour eBehaviour) const { return (eBehaviour < RLV_BHVR_COUNT) ? (0 != m_Behaviours[eBehaviour]) : false; }
-	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;
-
-	// Returns TRUE if at least one object (except the specified one) contains the specified behaviour
+	// Returns TRUE if at least one object (except the specified one) contains the specified behaviour (and optional option)
 	bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUID& idObj) const;
-	bool hasBehaviourExcept(const std::string& strBehaviour, const LLUUID& uuid) const;
 	bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const std::string& strOption, const LLUUID& idObj) const;
-	bool hasBehaviourExcept(const std::string& strBehaviour, const std::string& strOption, const LLUUID& idObj) const;
 
-	// Returns TRUE if there is at least 1 undetachable attachment
+	// Returns TRUE if there is at least 1 non-detachable attachment
 	bool hasLockedAttachment() const { return (0 != m_Attachments.size()); }
-	// Returns TRUE if there is at least 1 undetachable HUD attachment
+	// Returns TRUE if there is at least 1 non-detachable HUD attachment
 	bool hasLockedHUD() const;
-
 	// 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)
+	// Returns TRUE if the specified attachment point is set non-detachable by anything other than pObj (or one of its children)
 	bool isDetachableExcept(S32 idxAttachPt, LLViewerObject* pObj) const;
-	// Marks the specified attachment point as (un)detachable (return value indicates success ; used by unit tests)
+	// Marks the specified attachment point as (non-)detachable (return value indicates success ; used by unit tests)
 	bool setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDetachable);
 	bool setDetachable(LLViewerObject* pObj, const LLUUID& idRlvObj, bool fDetachable);
 
-	// Adds or removes an exception for the specified restriction
-	void addException(ERlvBehaviour eBehaviour, const LLUUID& uuid);
-	void removeException(ERlvBehaviour eBehaviour, const LLUUID& uuid);
-	// Returns TRUE is the specified UUID is exempt from a restriction (tplure/sendim/recvim/etc)
-	bool isException(ERlvBehaviour eBehaviour, const LLUUID& uuid) const;
-	bool isException(const std::string& strBehaviour, const LLUUID& uuid) const;
+	// Adds or removes an exception for the specified behaviour
+	void addException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption);
+	void removeException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption);
+	// Returns TRUE if the specified option was added as an exception for the specified behaviour
+	bool isException(ERlvBehaviour eBhvr, const RlvExceptionOption& varOption, ERlvExceptionCheck typeCheck = RLV_CHECK_DEFAULT) const;
+	// Returns TRUE if the specified behaviour should behave "permissive" (rather than "strict"/"secure")
+	bool isPermissive(ERlvBehaviour eBhvr) const;
 
 	// Returns TRUE if the specified layer is removable (use hasBehaviour(RLV_BHVR_REMOUTFIT) for the general case)
 	bool isRemovable(EWearableType type) const	{ return (type < WT_COUNT) ? (0 == m_LayersRem[type]) : true; }
@@ -121,6 +121,7 @@ public:
 	void               filterNames(std::string& strUTF8Text) const;						// @shownames
 	const std::string& getAnonym(const std::string& strName) const;						// @shownames
 	std::string        getVersionString() const;										// @version
+	std::string        getVersionNumString() const;										// @versionnum
 	BOOL               isAgentNearby(const LLUUID& uuid) const;							// @shownames
 	bool               redirectChatOrEmote(const std::string& strUTF8Test) const;		// @redirchat and @rediremote
 
@@ -274,11 +275,10 @@ extern rlv_handler_t gRlvHandler;
 // Inlined member functions
 //
 
-// Checked: 2009-07-09 (RLVa-1.0.0f)
-inline void RlvHandler::addException(ERlvBehaviour eBehaviour, const LLUUID& uuid)
+// Checked: 2009-10-04 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+inline void RlvHandler::addException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption)
 {
-	if (!uuid.isNull())
-		m_Exceptions.insert(std::pair<LLUUID, ERlvBehaviour>(uuid, eBehaviour));
+	m_Exceptions.insert(std::pair<ERlvBehaviour, RlvException>(eBhvr, RlvException(idObj, eBhvr, varOption)));
 }
 
 // Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
@@ -288,7 +288,7 @@ inline bool RlvHandler::canShowHoverText(LLViewerObject *pObj) const
 		    !( (hasBehaviour(RLV_BHVR_SHOWHOVERTEXTALL)) ||
 			   ( (hasBehaviour(RLV_BHVR_SHOWHOVERTEXTWORLD)) && (!pObj->isHUDAttachment()) ) ||
 			   ( (hasBehaviour(RLV_BHVR_SHOWHOVERTEXTHUD)) && (pObj->isHUDAttachment()) ) ||
-			   (isException(RLV_BHVR_SHOWHOVERTEXT, pObj->getID())) ) );
+			   (isException(RLV_BHVR_SHOWHOVERTEXT, pObj->getID(), RLV_CHECK_PERMISSIVE)) ) );
 }
 
 // Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
@@ -321,6 +321,12 @@ inline std::string RlvHandler::getVersionString()  const
 		RLVa_VERSION_MAJOR, RLVa_VERSION_MINOR, RLVa_VERSION_PATCH);
 }
 
+// Checked: 2009-10-04 (RLVa-1.0.4b) | Added: RLVa-1.0.4b
+inline std::string RlvHandler::getVersionNumString()  const
+{
+	return llformat("%d%02d%02d%02d", RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH, RLV_VERSION_BUILD);
+}
+
 // Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
 inline bool RlvHandler::hasAttachPointName(const LLInventoryItem *pItem, bool fStrict) const
 {
@@ -334,18 +340,6 @@ inline bool RlvHandler::hasBehaviour(ERlvBehaviour eBehaviour, const std::string
 }
 
 // Checked:
-inline bool RlvHandler::hasBehaviour(const std::string& strBehaviour) const
-{
-	return hasBehaviourExcept(strBehaviour, LLUUID::null);
-}
-
-// Checked:
-inline bool RlvHandler::hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const
-{
-	return hasBehaviourExcept(strBehaviour, strOption, LLUUID::null);
-}
-
-// Checked:
 inline bool RlvHandler::hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUID& idObj) const
 {
 	return hasBehaviourExcept(eBehaviour, std::string(), idObj);
@@ -379,22 +373,11 @@ inline bool RlvHandler::isDetachable(LLViewerObject* pObj) const
 	return (pObj == NULL) || (!pObj->isAttachment()) || (isDetachable(getAttachPointIndex(pObj)));
 }
 
-// Checked:
-inline bool RlvHandler::isException(ERlvBehaviour eBehaviour, const LLUUID& uuid) const
-{
-	for (rlv_exception_map_t::const_iterator itException = m_Exceptions.lower_bound(uuid), 
-			endException = m_Exceptions.upper_bound(uuid); itException != endException; ++itException)
-	{
-		if (itException->second == eBehaviour)
-			return true;
-	}
-	return false;
-}
-
-// Checked:
-inline bool RlvHandler::isException(const std::string& strBehaviour, const LLUUID& uuid) const
+inline bool RlvHandler::isPermissive(ERlvBehaviour eBhvr) const
 {
-	return hasBehaviour(strBehaviour, uuid.asString());
+	return (RlvCommand::hasStrictVariant(eBhvr)) 
+		? !((hasBehaviour(RLV_BHVR_PERMISSIVE)) || (isException(RLV_BHVR_PERMISSIVE, eBhvr, RLV_CHECK_PERMISSIVE)))
+		: true;
 }
 
 // Checked: 2009-07-29 (RLVa-1.0.1b) | Added: RLVa-1.0.1b
@@ -428,19 +411,16 @@ inline bool RlvHandler::isRemovableExcept(EWearableType type, const LLUUID& idOb
 	}
 #endif // RLV_EXTENSION_FLAG_NOSTRIP
 
-// Checked: 2009-07-09 (RLVa-1.0.0f)
-inline void RlvHandler::removeException(ERlvBehaviour eBehaviour, const LLUUID &uuid)
+// Checked: 2009-10-04 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+inline void RlvHandler::removeException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption)
 {
-	if (!uuid.isNull())
+	for (rlv_exception_map_t::iterator itException = m_Exceptions.lower_bound(eBhvr), 
+			endException = m_Exceptions.upper_bound(eBhvr); itException != endException; ++itException)
 	{
-		for (rlv_exception_map_t::iterator itException = m_Exceptions.lower_bound(uuid), 
-				endException = m_Exceptions.upper_bound(uuid); itException != endException; ++itException)
+		if ( (itException->second.idObject == idObj) && (itException->second.varOption == varOption) )
 		{
-			if (itException->second == eBehaviour)
-			{
-				m_Exceptions.erase(itException);
-				break;
-			}
+			m_Exceptions.erase(itException);
+			break;
 		}
 	}
 }
diff --git a/linden/indra/newview/rlvhelper.cpp b/linden/indra/newview/rlvhelper.cpp
index f495384..c8d430d 100644
--- a/linden/indra/newview/rlvhelper.cpp
+++ b/linden/indra/newview/rlvhelper.cpp
@@ -23,7 +23,7 @@ RlvCommand::RlvBhvrTable RlvCommand::m_BhvrMap;
 
 // 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)
+	: m_eBehaviour(RLV_BHVR_UNKNOWN), m_fStrict(false), m_eParamType(RLV_TYPE_UNKNOWN)
 {
 	if ((m_fValid = parseCommand(strCommand, m_strBehaviour, m_strOption, m_strParam)))
 	{
@@ -51,8 +51,12 @@ RlvCommand::RlvCommand(const std::string& strCommand)
 		return;
 	}
 
-	RlvBhvrTable::const_iterator itBhvr = m_BhvrMap.find(m_strBehaviour);
-	if (itBhvr != m_BhvrMap.end())
+	// Check if this is the "strict" (aka "secure") variation of a behaviour
+	std::string::size_type idxStrict = m_strBehaviour.find("_sec");
+	m_fStrict = (std::string::npos != idxStrict) && (idxStrict + 4 == m_strBehaviour.length());
+
+	RlvBhvrTable::const_iterator itBhvr = m_BhvrMap.find( (!m_fStrict) ? m_strBehaviour : m_strBehaviour.substr(0, idxStrict));
+	if ( (itBhvr != m_BhvrMap.end()) && ((!m_fStrict) || (hasStrictVariant(itBhvr->second))) )
 		m_eBehaviour = itBhvr->second;
 }
 
@@ -104,8 +108,8 @@ void RlvCommand::initLookupTable()
 				"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"
+				"acceptpermission", "shownames", "fly", "getsitid", "setdebug", "setenv", "detachme", "showhovertextall", 
+				"showhovertextworld", "showhovertexthud", "showhovertext", "notify", "defaultwear", "versionnum", "permissive"
 			};
 
 		for (int idxBvhr = 0; idxBvhr < RLV_BHVR_COUNT; idxBvhr++)
@@ -133,12 +137,14 @@ bool RlvObject::addCommand(const RlvCommand& rlvCmd)
 		return false;
 
 	// Don't add duplicate commands for this object (ie @detach=n followed by another @detach=n later on)
-	bool fDuplicate =
-		(RLV_BHVR_UNKNOWN != rlvCmd.getBehaviourType())
-			? hasBehaviour(rlvCmd.getBehaviourType(), rlvCmd.getOption())
-			: hasBehaviour(rlvCmd.getBehaviour(), rlvCmd.getOption());
-	if (fDuplicate)
-		return false;
+	for (rlv_command_list_t::iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+	{
+		if ( (itCmd->getBehaviour() == rlvCmd.getBehaviour()) && (itCmd->getOption() == rlvCmd.getOption()) && 
+			 (itCmd->isStrict() == rlvCmd.isStrict() ) )
+		{
+			return false;
+		}
+	}
 
 	// Now that we know it's not a duplicate, add it to the end of the list
 	m_Commands.push_back(rlvCmd);
@@ -155,7 +161,8 @@ bool RlvObject::removeCommand(const RlvCommand& rlvCmd)
 	for (rlv_command_list_t::iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
 	{
 		//if (*itCmd == rlvCmd) <- commands will never be equal since one is an add and the other is a remove *rolls eyes*
-		if ( (itCmd->getBehaviour() == rlvCmd.getBehaviour()) && (itCmd->getOption() == rlvCmd.getOption()) )
+		if ( (itCmd->getBehaviour() == rlvCmd.getBehaviour()) && (itCmd->getOption() == rlvCmd.getOption()) && 
+			 (itCmd->isStrict() == rlvCmd.isStrict() ) )
 		{
 			m_Commands.erase(itCmd);
 			return true;
@@ -164,34 +171,18 @@ bool RlvObject::removeCommand(const RlvCommand& rlvCmd)
 	return false;	// Command was never added so nothing to remove now
 }
 
-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;
-}
-
-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;
-}
-
-bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const
+bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, bool fStrictOnly) const
 {
 	for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
-		if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption() == strOption) )
+		if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption().empty()) && ((!fStrictOnly) || (itCmd->isStrict())) )
 			return true;
 	return false;
 }
 
-bool RlvObject::hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const
+bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption, bool fStrictOnly) const
 {
 	for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
-		if ( (itCmd->getBehaviour() == strBehaviour) && (itCmd->getOption() == strOption) )
+		if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption() == strOption) && ((!fStrictOnly) || (itCmd->isStrict())) )
 			return true;
 	return false;
 }
@@ -361,6 +352,11 @@ RlvWLSnapshot* RlvWLSnapshot::takeSnapshot()
 
 BOOL RlvSettings::fShowNameTags = FALSE;
 
+BOOL RlvSettings::getEnableWear()
+{
+	return rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, TRUE) && (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR));
+}
+
 #ifdef RLV_EXTENSION_STARTLOCATION
 	// Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1d
 	void RlvSettings::updateLoginLastLocation()
@@ -475,6 +471,13 @@ bool rlvCanDeleteOrReturn()
 	return fIsAllowed;
 }
 
+// Checked: 2009-10-04 (RLVa-1.0.4b) | Modified: RLVa-1.0.4b
+BOOL rlvEnableWearEnabler(void* pParam)
+{
+	// Visually disables the "Enable Wear" option when restricted from toggling it
+	return (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR));
+}
+
 // Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
 S32 rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type)
 {
diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
index f36989b..42d10b8 100644
--- a/linden/indra/newview/rlvhelper.h
+++ b/linden/indra/newview/rlvhelper.h
@@ -9,6 +9,15 @@
 #include "llwlparamset.h"
 #include "rlvdefines.h"
 
+#ifdef LL_WINDOWS
+	#pragma warning (push)
+	#pragma warning (disable : 4702) // warning C4702: unreachable code
+#endif
+#include <boost/variant.hpp>
+#ifdef LL_WINDOWS
+	#pragma warning (pop)
+#endif
+
 // ============================================================================
 // RlvCommand
 //
@@ -28,10 +37,12 @@ public:
 	const std::string& getOption() const        { return m_strOption; }
 	const std::string& getParam() const         { return m_strParam; }
 	ERlvParamType      getParamType() const     { return m_eParamType; }
+	bool               isStrict() const			{ return m_fStrict; }
 	bool               isValid() const          { return m_fValid; }
 
 	static ERlvBehaviour      getBehaviourFromString(const std::string& strBhvr);
 	static const std::string& getStringFromBehaviour(ERlvBehaviour eBhvr);
+	static bool               hasStrictVariant(ERlvBehaviour eBhvr);
 
 	static void initLookupTable();
 protected:
@@ -50,6 +61,7 @@ protected:
 	bool         	m_fValid;
 	std::string  	m_strBehaviour;
 	ERlvBehaviour	m_eBehaviour;
+	bool            m_fStrict;
 	std::string  	m_strOption;
 	std::string  	m_strParam;
 	ERlvParamType	m_eParamType;
@@ -78,10 +90,8 @@ public:
 	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;
+	bool        hasBehaviour(ERlvBehaviour eBehaviour, bool fStrictOnly) const;
+	bool        hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption, bool fStrictOnly) const;
 
 	const rlv_command_list_t* getCommandList() const { return &m_Commands; }
 
@@ -190,6 +200,24 @@ private:
 typedef std::list<RlvRetainedCommand> rlv_retained_list_t;
 
 // ============================================================================
+// RlvException
+//
+
+typedef boost::variant<std::string, LLUUID, S32, ERlvBehaviour> RlvExceptionOption;
+
+struct RlvException
+{
+public:
+	LLUUID				idObject;    // UUID of the object that added the exception
+	ERlvBehaviour		eBehaviour;  // Behaviour the exception applies to
+	RlvExceptionOption	varOption;   // Exception data (type is dependent on eBehaviour)
+
+	RlvException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& option) : idObject(idObj), eBehaviour(eBhvr), varOption(option) {}
+private:
+	RlvException();
+};
+
+// ============================================================================
 // RlvWLSnapshot
 //
 
@@ -225,7 +253,7 @@ public:
 	static BOOL getDebug()					{ return rlvGetSettingBOOL(RLV_SETTING_DEBUG, FALSE); }
 	static BOOL getForbidGiveToRLV()		{ return rlvGetSettingBOOL(RLV_SETTING_FORBIDGIVETORLV, TRUE); }
 
-	static BOOL getEnableWear()				{ return rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, FALSE); }
+	static BOOL getEnableWear();
 	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); }
@@ -290,6 +318,7 @@ struct RlvSelectIsSittingOn : public LLSelectedNodeFunctor
 
 BOOL rlvAttachToEnabler(void* pParam);
 bool rlvCanDeleteOrReturn();
+BOOL rlvEnableWearEnabler(void* pParam);
 S32  rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type);
 bool rlvIsEmote(const std::string& strUTF8Text);
 bool rlvIsValidReplyChannel(S32 nChannel);
@@ -344,6 +373,22 @@ inline void RlvCurrentlyWorn::fetchItem(const LLUUID& idItem)
 	}
 }
 
+inline bool RlvCommand::hasStrictVariant(ERlvBehaviour eBhvr)
+{
+	switch (eBhvr)
+	{
+		case RLV_BHVR_RECVCHAT:
+		case RLV_BHVR_RECVEMOTE:
+		case RLV_BHVR_RECVIM:
+		case RLV_BHVR_SENDIM:
+		case RLV_BHVR_TPLURE:
+		case RLV_BHVR_SENDCHANNEL:
+			return true;
+		default:
+			return false;
+	}
+}
+
 // ============================================================================
 // Inlined helper functions
 //
-- 
cgit v1.1


From d7757f10568fc07d0205a9c9c0825343328348f6 Mon Sep 17 00:00:00 2001
From: unknown
Date: Thu, 15 Oct 2009 20:33:44 -0400
Subject: Fix rlvdefines.h with VC80 warning C4819 - character cannot be
 represented in some codesets

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

(limited to 'linden')

diff --git a/linden/indra/newview/rlvdefines.h b/linden/indra/newview/rlvdefines.h
index d1e0b75..118ba31 100644
--- a/linden/indra/newview/rlvdefines.h
+++ b/linden/indra/newview/rlvdefines.h
@@ -77,7 +77,7 @@ const S32 RLVa_VERSION_BUILD = 4;
 #define RLV_ROOT_FOLDER					"#RLV"
 #define RLV_CMD_PREFIX					'@'
 #define RLV_PUTINV_PREFIX				"#RLV/~"
-#define RLV_SETROT_OFFSET				F_PI_BY_TWO		// @setrot is off by 90� with the rest of SL
+#define RLV_SETROT_OFFSET				F_PI_BY_TWO		// @setrot is off by 90° with the rest of SL
 
 #define RLV_FOLDER_FLAG_NOSTRIP			"nostrip"
 #define RLV_FOLDER_PREFIX_HIDDEN		'.'
-- 
cgit v1.1


From a65acad8a82f80a7ae3739789f7a168207185cbe Mon Sep 17 00:00:00 2001
From: Kakurady
Date: Fri, 16 Oct 2009 13:21:01 -0400
Subject: Continue to fix unable to compile on CP936

---
 linden/indra/newview/jcfloater_animation_list.cpp | 2 +-
 linden/indra/newview/jcfloater_animation_list.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/jcfloater_animation_list.cpp b/linden/indra/newview/jcfloater_animation_list.cpp
index 9f5c9bb..368e7d6 100644
--- a/linden/indra/newview/jcfloater_animation_list.cpp
+++ b/linden/indra/newview/jcfloater_animation_list.cpp
@@ -16,7 +16,7 @@
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS �AS IS�
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
diff --git a/linden/indra/newview/jcfloater_animation_list.h b/linden/indra/newview/jcfloater_animation_list.h
index d8262f0..61bf635 100644
--- a/linden/indra/newview/jcfloater_animation_list.h
+++ b/linden/indra/newview/jcfloater_animation_list.h
@@ -16,7 +16,7 @@
  *      may be used to endorse or promote products derived from this
  *      software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS �AS IS�
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
-- 
cgit v1.1


From 4cf2b9abe06996ea5ca1ee68d9008b3bd4d08dc1 Mon Sep 17 00:00:00 2001
From: Kakurady
Date: Fri, 16 Oct 2009 13:55:54 -0400
Subject: Fix muting objects with same name as avatar mutes ScriptDialogs from
 avatar.

ScriptDialogs from muted objects or groups will not be displayed either.
---
 linden/indra/newview/llviewermessage.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index c403e3e..eeef114 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -5479,18 +5479,32 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 
 	// Don't show lldialog boxes from muted avs -- McCabe
 	std::string agent_name = first_name + " " + last_name;
-	if (!first_name.empty())
+	if (!last_name.empty())
 	{
 		std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
 		for (U32 i = 0; i < mutes.size(); i++)
-		{
-			if (mutes[i].mName == agent_name)
+		{	
+			//this is almost like saying (mutes[i].mType != LLMute::Object), but more verbose ... -Kaku
+			if (
+				((mutes[i].mType == LLMute::AGENT)
+					&& (mutes[i].mName == agent_name))
+				|| ((mutes[i].mType == LLMute::GROUP)
+					&& (mutes[i].mName == last_name))
+				|| ((mutes[i].mType == LLMute::BY_NAME)
+					//don't mute groups by name in case a group has a last name as a group name.
+					&& ((mutes[i].mName == agent_name)))
+			)
 			{
 				delete info;
 				return;
 			}
 		}
 	}
+	// or Scriptdialog boxes from muted objects -- Kakurady
+	if (LLMuteList::getInstance()->isMuted(info->mObjectID, title)){
+		delete info;
+		return;
+	}
 
 		// unused for now
 	LLUUID image_id;
-- 
cgit v1.1


From a056eb1973d6f547b689e05a617016e7f0532941 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 17 Oct 2009 20:50:10 -0700
Subject: Ported notecard security fix from LL's 1.23.5 viewer

---
 linden/indra/newview/llassetuploadresponders.cpp |  2 +-
 linden/indra/newview/llpreview.cpp               | 29 ++++++++++++++++++++++++
 linden/indra/newview/llpreview.h                 |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index be3882e..311ff64 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -440,7 +440,6 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
 	{
 		case LLAssetType::AT_NOTECARD:
 			{
-
 				// Update the UI with the new asset.
 				LLPreviewNotecard* nc;
 				nc = (LLPreviewNotecard*)LLPreview::find(item_id);
@@ -459,6 +458,7 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
 							LLAssetType::AT_NOTECARD);
 					}
 
+					nc->setAssetId(content["new_asset"].asUUID());
 					nc->refreshFromInventory();
 				}
 			}
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 1a6d2ca..055851b 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -596,3 +596,32 @@ void LLMultiPreview::setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID&
 		sAutoOpenPreviewHandles[id] = previewp->getHandle();
 	}
 }
+
+void LLPreview::setAssetId(const LLUUID& asset_id)
+{
+	const LLViewerInventoryItem* item = getItem();
+	if(NULL == item)
+	{
+		return;
+	}
+
+	if(mObjectUUID.isNull())
+	{
+		// Update avatar inventory asset_id.
+		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
+		new_item->setAssetUUID(asset_id);
+		gInventory.updateItem(new_item);
+		gInventory.notifyObservers();
+	}
+	else
+	{
+		// Update object inventory asset_id.
+		LLViewerObject* object = gObjectList.findObject(mObjectUUID);
+		if(NULL == object)
+		{
+			llwarns << "LLPreview::setAssetId() called on unrecognized object, UUID : " << mObjectUUID << llendl;
+			return;
+		}
+		object->updateViewerInventoryAsset(item, asset_id);
+	}
+}
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index 74daca6..4e159f3 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -83,6 +83,7 @@ public:
 	void setItemID(const LLUUID& item_id);
 	void setObjectID(const LLUUID& object_id);
 	void setSourceID(const LLUUID& source_id);
+	void setAssetId(const LLUUID& asset_id);
 	const LLViewerInventoryItem *getItem() const; // searches if not constructed with it
 
 	static LLPreview* find(const LLUUID& item_uuid);
-- 
cgit v1.1


From d91accfd6135d56cd6f079b95fdce3f7844df706 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 9 Oct 2009 19:53:10 -0500
Subject: Updated and added some Linux libs.

Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml
Added: gstreamer-plugins, theora
---
 linden/indra/cmake/GStreamer.cmake      | 15 +++---
 linden/indra/cmake/UI.cmake             |  7 ++-
 linden/indra/newview/viewer_manifest.py | 16 +------
 linden/install.xml                      | 81 +++++++++++++++++++++------------
 4 files changed, 68 insertions(+), 51 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 8bfad11..51e1550 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,18 +1,19 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-  # possible libxml should have its own .cmake file instead
+  # Maybe libxml and glib should have their own .cmake files
   use_prebuilt_binary(libxml)
+  use_prebuilt_binary(glib)
+
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
+
   use_prebuilt_binary(gstreamer)
+  use_prebuilt_binary(gstreamer-plugins)
 
 if (WINDOWS)
 
-  use_prebuilt_binary(libxml)
   use_prebuilt_binary(iconv)
-  use_prebuilt_binary(glib)
-  use_prebuilt_binary(gstreamer-plugins)
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_INCLUDE_DIRS
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
@@ -63,7 +64,7 @@ else (WINDOWS)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
 
-  if (DARWIN)
+  if (DARWIN) # Mac
 
     find_library( XML2_LIB
       NAMES xml2.2
@@ -89,7 +90,9 @@ else (WINDOWS)
         ${XML2_LIB}
         )
 
-  else (DARWIN)
+  else (DARWIN) # Linux
+
+    use_prebuilt_binary(theora)
 
     set(GSTREAMER_LIBRARIES
         gstvideo-0.10
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
index f529f5b..b70a531 100644
--- a/linden/indra/cmake/UI.cmake
+++ b/linden/indra/cmake/UI.cmake
@@ -31,13 +31,13 @@ if (STANDALONE)
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
 else (STANDALONE)
-  use_prebuilt_binary(gtk-atk-pango-glib)
+  use_prebuilt_binary(gtk-etc)
   if (LINUX)
     set(UI_LIBRARIES
         atk-1.0
+        cairo
         gdk-x11-2.0
         gdk_pixbuf-2.0
-        Xinerama
         glib-2.0
         gmodule-2.0
         gobject-2.0
@@ -47,11 +47,14 @@ else (STANDALONE)
         pangoft2-1.0
         pangox-1.0
         pangoxft-1.0
+        pixman-1
         )
   endif (LINUX)
 
   include_directories (
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1
       ${LIBS_PREBUILT_DIR}/include
       )
   foreach(include ${${LL_ARCH}_INCLUDES})
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 6ae5b80..b4a0b6c 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -798,14 +798,11 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
 
-            self.path("libopenal.so") # symlink
             self.path("libopenal.so.1")
-            self.path("libalut.so")
+            self.path("libalut.so.0")
 
             # Gstreamer libs
-            self.path("libgstbase-0.10.so") # symlink
             self.path("libgstbase-0.10.so.0")
-            self.path("libgstreamer-0.10.so") # symlink
             self.path("libgstreamer-0.10.so.0")
             self.path("libgstaudio-0.10.so.0")
             self.path("libgstbase-0.10.so.0")
@@ -822,18 +819,10 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libgstvideo-0.10.so.0")
 
             # Gstreamer plugin dependencies
-            self.path("libavcodec.so.52")
-            self.path("libavformat.so.52")
-            self.path("libavutil.so.49")
-            self.path("libxvidcore.so.4")
-            self.path("libfaac.so.0")
-            self.path("libfaad.so.1")
-            self.path("libmp3lame.so.0")
             self.path("libogg.so.0")
+            self.path("libtheora.so.0")
             self.path("libvorbis.so.0")
             self.path("libvorbisenc.so.2")
-            self.path("libxml2.so.2")
-            self.path("libxvidcore.so.4")
 
             # Gstreamer plugins
             if self.prefix("gstreamer-plugins"):
@@ -848,7 +837,6 @@ class Linux_i686Manifest(LinuxManifest):
                 self.path("libgstdecodebin2.so")
                 self.path("libgstdecodebin.so")
                 self.path("libgstesd.so")
-                self.path("libgstffmpegcolorspace.so")
                 self.path("libgstffmpeg.so")
                 self.path("libgstgnomevfs.so")
                 self.path("libgsticydemux.so")
diff --git a/linden/install.xml b/linden/install.xml
index a713b0e..455c7df 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -545,9 +545,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>2f1a9e14f9213c2c9564c1c1cfdd6d47</string>
+            <string>674b2a79cef8ddd28f53b28b44dcffe2</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-linux-20080817.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux-20091009.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -582,9 +582,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>c829b638b6eef71ca63418cb9aea46a2</string>
+            <string>591900261bddbe3d1e579f7e6070081a</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091005.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -601,6 +601,13 @@
         <string>lgpl</string>
         <key>packages</key>
         <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>2cce992f4506fbc11f827aa80eb499f4</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091008.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -610,12 +617,16 @@
           </map>
         </map>
       </map>
-      <key>gtk-atk-pango-glib</key>
+      <key>gtk-etc</key>
       <map>
         <key>copyright</key>
-        <string>Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald</string>
+        <string>Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+atk: Copyright 2001 Sun Microsystems Inc.
+cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Red Hat, Inc.
+
+</string>
         <key>description</key>
-        <string>Libraries associated with GTK for gui features. atk: interfaces for accessibility; glib: low-level core functionality for using GTK+ and GNOME; pango: layout/rendering of text w/ emphasis on internationalization.</string>
+        <string>GTK+ and associated libraries (atk, cairo, pango, pixman)</string>
         <key>license</key>
         <string>lgpl</string>
         <key>packages</key>
@@ -623,16 +634,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>21c16a74f8fc9a62e3ab944a6eb7403d</string>
+            <string>143844d33c5075bf30f8af1fd86a6f09</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz</uri>
-          </map>
-          <key>linux32</key>
-          <map>
-            <key>md5sum</key>
-            <string>21c16a74f8fc9a62e3ab944a6eb7403d</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux-20091008.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -901,9 +905,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>4b5d2dcfe8a49b73fb69f10aab441092</string>
+            <string>cec4328f5808b49836c467831a5f285e</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux-20091005.tar.bz2</uri>
           </map>
           <key>linux32</key>
           <map>
@@ -1080,7 +1084,7 @@ anguage Infrstructure (CLI) international standard</string>
         <key>description</key>
         <string>Ogg: container format Vorbis: audio compression scheme</string>
         <key>license</key>
-        <string>ogg-vorbis</string>
+        <string>xiph-bsd</string>
         <key>packages</key>
         <map>
           <key>darwin</key>
@@ -1093,9 +1097,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>df1809565b87b1dc28e3ca70db6e7d46</string>
+            <string>92c614b34fc283588625805076d58e93</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-linux-20080812.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux-20091003.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
@@ -1133,9 +1137,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>f0d9a8d1318b519cffe6c40c9cac4e21</string>
+            <string>6f69d70ec18a3c3c2dee81bf6331c784</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20081010c-59a71b14-plughw.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/openal-linux-20091009.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -1207,11 +1211,11 @@ anguage Infrstructure (CLI) international standard</string>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.2-darwin-20080812.tar.bz2</uri>
           </map>
           <key>linux</key>
-	  <map>
-		  <key>md5sum</key>
-		  <string>02af0dad64803e0d821bc09e6038682c</string>
-		  <key>url</key>
-		<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2</uri>
+          <map>
+            <key>md5sum</key>
+            <string>02af0dad64803e0d821bc09e6038682c</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3-linux-20081124b.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -1281,6 +1285,25 @@ anguage Infrstructure (CLI) international standard</string>
           </map>
         </map>
       </map>
+      <key>theora</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2002-2009 Xiph.org Foundation</string>
+        <key>description</key>
+        <string>Ogg Theora video format</string>
+        <key>license</key>
+        <string>xiph-bsd</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>a6e6e250efaf3f25db4699d9b5dfec4b</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/theora-linux-20091003.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>tut</key>
       <map>
         <key>copyright</key>
@@ -1609,7 +1632,7 @@ Cass Everitt - cass@r3.nu
         <key>url</key>
         <string>http://www.mozilla.org/MPL/MPL-1.1.html</string>
       </map>
-      <key>ogg-vorbis</key>
+      <key>xiph-bsd</key>
       <map>
         <key>url</key>
         <string>http://www.xiph.org/licenses/bsd/</string>
-- 
cgit v1.1


From 428efd664d6629f8c590016c80d8a86181bbc2d4 Mon Sep 17 00:00:00 2001
From: Lilly Zenovka
Date: Mon, 19 Oct 2009 09:02:41 +0200
Subject: Fixes VWR-12161:  avatar_skeleton.xml cannot be parsed

---
 linden/indra/llmedia/llmediaimplllmozlib.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 05d7220..93f4a64 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -49,9 +49,9 @@
 	#include "GL/gl.h"
 #endif
 
-#if LL_LINUX
- #include <locale.h>
-#endif
+
+#include <locale.h>
+
 
 #include <iostream>
 
@@ -89,23 +89,23 @@ LLMediaImplLLMozLib::LLMediaImplLLMozLib() :
 // (static) super-initialization - called once at application startup
 bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data )
 {
-#if LL_LINUX
+
 	// Yuck, Mozilla's GTK callbacks play with the locale - push/pop
 	// the locale to protect it, as exotic/non-C locales
 	// causes our code lots of general critical weirdness
 	// and crashness. (SL-35450)
 	static std::string saved_locale;
 	saved_locale = setlocale(LC_ALL, NULL);
-#endif // LL_LINUX
+
 
 	bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(),
 											init_data->getBrowserComponentDir(),
 											  init_data->getBrowserProfileDir(),
 												init_data->getBrowserParentWindow() );
 
-#if LL_LINUX
+
 	setlocale(LC_ALL, saved_locale.c_str() );
-#endif // LL_LINUX
+
 
 	return result;
 }
-- 
cgit v1.1


From b81968c663282db7eb5db5b8e506aa533c636ccc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 19 Oct 2009 01:44:31 -0700
Subject: Applied rlva_init-imprudence.patch (fixes RLVa not initializing in
 1.2)

---
 linden/indra/newview/llappviewer.cpp |  2 +-
 linden/indra/newview/llstartup.cpp   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 448e26b..c432066 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3927,7 +3927,7 @@ void LLAppViewer::handleLoginComplete()
 	writeDebugInfo();
 
 // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
-	// TODO-RLVa: find some way to initialize the lookup table when we need them *and* support toggling RLVa at runtime
+	// NOTE: this function isn't called in Imprudence so any changes need to go in idle_startup() instead
 	gRlvHandler.initLookupTables();
 
 	if (rlv_handler_t::isEnabled())
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 346f7dd..d747bd2 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2647,6 +2647,23 @@ bool idle_startup()
 
 		LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
 
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+		// RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function
+		gRlvHandler.initLookupTables();
+
+		if (rlv_handler_t::isEnabled())
+		{
+			RlvCurrentlyWorn::fetchWorn();
+			rlv_handler_t::fetchSharedInventory();
+
+			#ifdef RLV_EXTENSION_STARTLOCATION
+				RlvSettings::updateLoginLastLocation();
+			#endif // RLV_EXTENSION_STARTLOCATION
+
+			gRlvHandler.processRetainedCommands();
+		}
+// [/RLVa:KB]
+
 		return TRUE;
 	}
 
-- 
cgit v1.1


From c0b31fcc3e16436ded72c4d36eb5a0d704fa7b8d Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 19 Oct 2009 10:33:38 -0700
Subject: Clamp map teleporting at 4096 rather than 1000

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

(limited to 'linden')

diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 70223c9..028ebf2 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -770,7 +770,7 @@ void LLFloaterWorldMap::updateLocation()
 void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
 {
 	LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
-	z_coord = llclamp(z_coord, 0, 1000);
+	z_coord = llclamp(z_coord, 0, 4096);
 	if (sim_info)
 	{
 		LLVector3 local_pos;
-- 
cgit v1.1


From 95b78d58fa6e1f18160fb42252d2f6b0e87ca372 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 19 Oct 2009 21:06:17 -0700
Subject: Partial fix for avatar names not displaying at > 1024m (won't be
 fixed until LL actually sends height in more than one byte -_-)

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

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 31e57a0..3807a90 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -279,12 +279,25 @@ void LLFloaterMap::populateRadar()
 	// [/RLVa:KB]
 
 				// 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];
-				sprintf(dist, "%.1f", distance);
-				std::string dist_string = dist;*/
-				std::string dist_string = llformat("%.1f", distance);
+				LLVector3d temp = positions[i];
+				if (positions[i].mdV[VZ] == 0.0f) // LL only sends height value up to 1024m, try to work around it
+				{
+					LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
+					if (av_obj != NULL && av_obj->isAvatar())
+					{
+						LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
+						if (avatarp != NULL)
+						{
+							temp = avatarp->getPositionGlobal();
+						}
+					}
+				}
+				F64 distance = dist_vec(temp, current_pos); 
+				// we round for accuracy when avs tp in
+				std::string dist_string = llformat("%.1f", llround((F32)distance, 0.1f));
+
+				/*llinfos << "Avatar :" << fullname << " Position: " << positions[i] << " Your Position: " 
+					<< current_pos << " Distance: " << distance << llendl;*/
 
 				if (notify_chat)
 				{
-- 
cgit v1.1


From 65e2f7b4d2f080a5bcbe00a1926f7f95e7926a79 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 21 Oct 2009 16:48:52 -0700
Subject: Added Advanced menu option for AllowMultipleViewers for testing
 purposes

---
 linden/indra/newview/llviewermenu.cpp              | 32 +++++++++++++++++++++-
 .../skins/default/xui/en-us/menu_viewer.xml        |  7 +++++
 2 files changed, 38 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4493ddf..d0e326c 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -10368,6 +10368,35 @@ class LLAvatarReportAbuse : public view_listener_t
 
 
 
+////////////////////////////
+// ALLOW MULTIPLE VIEWERS //
+////////////////////////////
+
+
+class LLAdvancedToggleMultipleViewers : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		BOOL cur_val = gSavedSettings.getBOOL("AllowMultipleViewers");
+		gSavedSettings.setBOOL("AllowMultipleViewers", !cur_val );
+		return true;
+	}
+};
+
+
+class LLAdvancedCheckMultipleViewers : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		bool new_value = gSavedSettings.getBOOL("AllowMultipleViewers");
+		std::string control_name = userdata["control"].asString();
+		gMenuHolder->findControl(control_name)->setValue(new_value);
+		return true;
+	}
+};
+
+
+
 ///////////////
 // RLVa Main //
 ///////////////
@@ -10793,7 +10822,8 @@ void initialize_menus()
 	addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");
 	addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
 	addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
-
+	addMenu(new LLAdvancedToggleMultipleViewers(), "Advanced.ToggleMultipleViewers");
+	addMenu(new LLAdvancedCheckMultipleViewers(), "Advanced.CheckMultipleViewers");
 
 	// RLVa
 	addMenu(new RLVaMainToggle(), "RLVa.Main.Toggle");
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 8d55a3b..222a9ad 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
@@ -2009,6 +2009,13 @@
       <on_click function="Advanced.ToggleClothingFloater"
                 userdata="" />
     </menu_item_check>
+    <menu_item_check name="Allow Multiple Instances"
+            label="Allow Multiple Instances">
+      <on_click function="Advanced.ToggleMultipleViewers"
+                userdata="" />
+      <on_check function="Advanced.CheckMultipleViewers"
+                userdata="" />
+    </menu_item_check>
     <menu_item_call name="Debug Settings"
                     label="Debug Settings">
       <on_click function="Advanced.ShowDebugSettings"
-- 
cgit v1.1