From 22fee625e5a1594139f8a434b3ea23f0b8a91b46 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 6 Sep 2013 15:39:00 -0400
Subject: [PATCH 1/3] Revert "You, my friend, are a victim of disorganized
 thinking."

This reverts commit d956f60c0bc7d6045f3c2790f925435adc249c7a.
---
 .../skins/default/xui/en-us/floater_instant_message.xml       | 2 +-
 .../xui/en-us/floater_instant_message_concisebuttons.xml      | 2 +-
 indra/newview/skins/default/xui/en-us/menu_avs_list.xml       | 4 ++--
 indra/newview/skins/default/xui/en-us/menu_radar.xml          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 25d9ed1b7..10fabcfd6 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -12,7 +12,7 @@
 	<string name="unavailable_text_label">Text chat is not available for this call.</string>
 	<string name="inventory_item_offered">Inventory item offered</string>
     <flyout_button bottom="-37" height="20" label="Profile" left="5" name="instant_message_flyout" width="80" list_position="below">
-      <!--flyout_button_item label="Request Teleport" name="request_teleport_item" value="3"/-->
+      <flyout_button_item label="Request Teleport" name="request_teleport_item" value="3"/>
       <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
     </flyout_button>
     <string name="ding on" value="Ding on new messages (On)"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
index 7cfbd80d6..2625e3869 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
@@ -14,7 +14,7 @@
     <flyout_button bottom="-20" follows="right|top" halign="center" height="20" label="Profile" left="280" name="instant_message_flyout" width="80" list_position="below">
       <flyout_button_item label="History" name="history_btn" value="1"/>
       <flyout_button_item label="Offer Teleport" name="profile_tele_btn" value="2"/>
-      <!--flyout_button_item label="Request Teleport" name="request_teleport_item" value="3"/-->
+      <flyout_button_item label="Request Teleport" name="request_teleport_item" value="3"/>
       <flyout_button_item label="Pay" name="pay_item" value="4"/>
       <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
     </flyout_button>
diff --git a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
index 402c5ca7b..a0d1b5a71 100644
--- a/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_avs_list.xml
@@ -48,10 +48,10 @@
     <on_click function="List.OfferTeleport"/>
     <on_enable function="List.EnableAnySelected"/>
   </menu_item_call>
-  <!--menu_item_call label="Request Teleport" name="Request Teleport">
+  <menu_item_call label="Request Teleport" name="Request Teleport">
     <on_click function="List.RequestTeleport"/>
     <on_visible function="List.EnableSingleSelected"/>
-  </menu_item_call-->
+  </menu_item_call>
   <menu_item_separator/>
   <menu_item_call label="Mute/Unmute" name="Mute/Unmute">
     <on_click function="List.Mute"/>
diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml
index 5552f27c9..a2e73b084 100644
--- a/indra/newview/skins/default/xui/en-us/menu_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml
@@ -53,10 +53,10 @@
       <on_click function="Radar.TeleportTo"/>
       <on_enable function="List.EnableSingleSelected"/>
     </menu_item_call>
-    <!--menu_item_call label="Request Teleport" name="Request Teleport">
+    <menu_item_call label="Request Teleport" name="Request Teleport">
       <on_click function="List.RequestTeleport"/>
       <on_visible function="List.EnableSingleSelected"/>
-    </menu_item_call-->
+    </menu_item_call>
     <menu_item_call label="Track/Untrack" name="Track/Untrack">
       <on_click function="Radar.Track"/>
       <on_enable function="List.EnableSingleSelected"/>

From 380642044ff8ca522ba5d4eac2abc6f3e0f53f8d Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Fri, 6 Sep 2013 15:42:14 -0400
Subject: [PATCH 2/3] Revert "Mewmew"

This reverts commit 27dcbef8fa7d24984732b9eaec7b0ee886f3c4d8.
---
 indra/newview/skins/default/xui/en-us/menu_inventory.xml      | 4 ++--
 .../skins/default/xui/en-us/panel_preferences_ascent_chat.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 886c34984..967c12462 100644
--- a/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -284,9 +284,9 @@
 	     mouse_opaque="true" name="Offer Teleport..." width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="lure" />
 	</menu_item_call>
-	<!--menu_item_call label="Request Teleport..." name="Request Teleport...">
+	<menu_item_call label="Request Teleport..." name="Request Teleport...">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="request_lure" />
-	</menu_item_call-->
+	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Start Conference Chat" left="0"
 	     mouse_opaque="true" name="Conference Chat" width="128">
 		<on_click filter="" function="Inventory.BeginIMSession" userdata="selected" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index a3dedff07..82f6429bb 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -112,7 +112,7 @@ The following wildcards are available to enhance your autoresponses: #n for user
       <check_box control_name="AntiSpamScripts" height="16" label="Scripts" name="Scripts" bottom_delta="0" left_delta="120"/>
       <check_box control_name="AntiSpamTeleports" height="16" label="Teleport Offers" name="Teleport Offers" bottom_delta="0" left_delta="120"/>
       <check_box control_name="AntiSpamGroupNotices" height="16" label="Group Notices" name="Group Notices" bottom_delta="0" left_delta="120"/>
-      <!--check_box control_name="AntiSpamTeleportRequests" height="16" label="Teleport Requests" name="Teleport Requests" left="14" bottom_delta="-20"/-->
+      <check_box control_name="AntiSpamTeleportRequests" height="16" label="Teleport Requests" name="Teleport Requests" left="14" bottom_delta="-20"/>
       <text name="Except those from:" left="21" bottom_delta="-10">Except those from:</text>
       <check_box control_name="AntiSpamNotMine" height="16" label="My objects" name="My objects" left="25" bottom_delta="-23"/>
       <check_box control_name="AntiSpamNotFriends" height="16" label="My friends" name="My friends" bottom_delta="0" left_delta="120"/>

From 0e5085e6bc639832442ab247937bc9c6cd910765 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <inusaito@gmail.com>
Date: Sun, 8 Sep 2013 10:50:16 -0400
Subject: [PATCH 3/3] Fix owner mask being displayed in the debug permissions
 for everyone mask

---
 indra/newview/llpanelpermissions.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index ad33397e3..42facc56c 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -692,16 +692,18 @@ void LLPanelPermissions::refresh()
 			getChild<LLUICtrl>("B:")->setValue("B: " + perm_string);
 			getChildView("B:")->setVisible(							TRUE);
 			
+			/*
 			perm_string = mask_to_string(owner_mask_on);
 			if (!supports_export && owner_mask_on & PERM_EXPORT) // Hide Export when not available
 				perm_string.erase(perm_string.find_last_of("E"));
-			//getChild<LLUICtrl>("O:")->setValue("O: " + perm_string);
-			//getChildView("O:")->setVisible(							TRUE);
+			getChild<LLUICtrl>("O:")->setValue("O: " + perm_string);
+			getChildView("O:")->setVisible(							TRUE);
+			*/
 			
 			getChild<LLUICtrl>("G:")->setValue("G: " + mask_to_string(group_mask_on));
 			getChildView("G:")->setVisible(							TRUE);
 			
-			perm_string = mask_to_string(owner_mask_on);
+			perm_string = mask_to_string(everyone_mask_on);
 			if (!supports_export && everyone_mask_on & PERM_EXPORT) // Hide Export when not available
 				perm_string.erase(perm_string.find_last_of("E"));
 			getChild<LLUICtrl>("E:")->setValue("E: " + perm_string);