From 546985431264353a40b5d670bbad9b1c04f55fb5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Sep 2009 10:11:36 -0700
Subject: Fixed inability to minimize chat history

---
 linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index d32832c..100c455 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false"
+<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" can_tear_off="true" enabled="true" height="270" left="15"
      min_height="150" min_width="425" mouse_opaque="true" name="chat floater"
      rect_control="FloaterChatRect" title="Local Chat" width="435">
-- 
cgit v1.1


From 5d99059dbcbb23966f14256c3704aaca1e84bb2e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Sep 2009 10:31:07 -0700
Subject: Rebranded startup loading page to Imprudence

---
 .../default/html/en-us/loading/imprudence_loading.png   | Bin 0 -> 10714 bytes
 .../skins/default/html/en-us/loading/loading.html       |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
new file mode 100644
index 0000000..f9ea7a2
Binary files /dev/null and b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png differ
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f..97174b0 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -2,7 +2,7 @@
 <table width="100%" height="100%" border="0">
 	<tr>
 		<td align="center" valign="middle" style="font-size:0.8em;">
-			<img src="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
+			<img src="imprudence_loading.png" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
 		</td>
 	</tr>
 </table>
-- 
cgit v1.1


From e31ae50534d752cf19a2bec3a86298bae3bb059a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Sep 2009 14:17:49 -0700
Subject: Added 'Go Here' to object pie menu

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

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 8d059c1..765529d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -54,7 +54,9 @@
         <on_click function="Object.ReportAbuse" />
         <on_enable function="Object.EnableReportAbuse" />
       </menu_item_call>
-      <menu_item_separator />
+      <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
+        <on_click function="GoToObject" />
+      </menu_item_call>
       <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
         <on_click function="Object.Inspect" />
         <on_enable function="Object.EnableInspect" />
-- 
cgit v1.1


From e0450b604383f3a0276097496f1935e1b543ec5e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Sep 2009 18:53:30 -0700
Subject: Integrated 1.23's tool floater with link/unlink buttons

---
 .../skins/default/xui/en-us/floater_tools.xml      | 173 +++++++++++----------
 1 file changed, 88 insertions(+), 85 deletions(-)

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 18d56b4..d9b51b1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
+<floater bottom="-374" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="565" 
      left="308" min_height="100" min_width="100" mouse_opaque="true"
      name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
      short_title="Build" width="272">
@@ -79,20 +79,24 @@
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
 	     name="radio select face" radio_style="true" width="114" />
-  <check_box bottom_delta="-22" control_name="SnapEnabled" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="16" label="Options..." label_selected="Options..." left_delta="75"
-	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+	<check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Edit linked parts" left="4" mouse_opaque="true"
+	     name="checkbox edit linked parts" width="114" />
+  <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Link" label_selected="Link"
+          left="10" mouse_opaque="true" name="link_btn" width="68" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Unlink" label_selected="Unlink"
+          left_delta="75" mouse_opaque="true" name="unlink_btn" width="68" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
 	     mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-    Ruler mode:
+    Ruler:
   </text>
-  <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-	     left_delta="74" max_chars="20" mouse_opaque="true"
+	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
+	     left_delta="40" max_chars="20" mouse_opaque="true"
 	     name="combobox grid mode" width="86">
     <combo_item name="World" value="World">
       World
@@ -112,16 +116,13 @@
 	     font="SansSerifSmall" height="16" initial_value="true"
 	     label="Stretch Textures" left_delta="0" mouse_opaque="true"
 	     name="checkbox stretch textures" width="134" />
-  <check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Edit linked parts" left="143" mouse_opaque="true"
-	     name="checkbox edit linked parts" width="114" />
-  <button bottom_delta="-18" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Link" label_selected="Link"
-          right="-5" mouse_opaque="true" name="link_btn" width="78" />
-  <button bottom_delta="-20" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Unlink" label_selected="Unlink"
-          right="-5" mouse_opaque="true" name="unlink_btn" width="78" />
+  <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
+	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+	<button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+       halign="center" valign="center"
+	     height="20" label="Options..." label_selected="Options..." left_delta="20"
+	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
 
 <!-- Help text -->
 
@@ -289,18 +290,18 @@
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
 	     border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
-	     hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100">
-	          Brush:
+	     hidden="false" mouse_opaque="true" name="Bulldozer:" v_pad="0" width="100">
+	          Bulldozer:
 	</text>
 
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
 	     border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
-	     hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100">
+	     hidden="false" mouse_opaque="true" name="Dozer Size:" v_pad="0" width="100">
 	          Size
 	</text>
 	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
-	     increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
+         increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
 	     mouse_opaque="true" name="slider brush size" width="80" />	
 
 
@@ -312,21 +313,23 @@
 	</text>
 	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
 	     increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
-	     mouse_opaque="true" name="slider force" width="80" />	
-
-
-	<button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
-	     name="button more" scale_image="TRUE" tool_tip="Advanced Options"
-	     width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
-	     name="button less" scale_image="TRUE" tool_tip="Advanced Options"
-	     width="80" />
+	     mouse_opaque="true" name="slider force" width="80" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
+         font="SansSerifSmall" h_pad="0" halign="right" height="16"
+         mouse_opaque="true" name="obj_count" v_pad="0" width="143">
+    Selected objects: [COUNT]
+  </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-181" left="118" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="right" height="16"
+       mouse_opaque="true" name="prim_count" v_pad="0" width="143">
+    primitives: [COUNT]
+  </text>
 
 <!-- Sub-tabs -->
 
-	<tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
+	<tab_container bottom="-565" follows="left|top" height="384" left="0" mouse_opaque="false"
 	     name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
 	     tab_position="top" width="272">
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
@@ -364,7 +367,7 @@
 				Thrax Linden
 			</text>
 			<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			     height="20" label="Profile..." label_selected="Profile..." left_delta="94"
 			     mouse_opaque="true" name="button creator profile" scale_image="TRUE"
 			     width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -380,7 +383,7 @@
 				Thrax Linden
 			</text>
 			<button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			     height="20" label="Profile..." label_selected="Profile..." left_delta="94"
 			     mouse_opaque="true" name="button owner profile" scale_image="TRUE"
 			     width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -397,15 +400,9 @@
 				The Lindens
 			</text>
 			<button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Set..." label_selected="Set..." left_delta="94"
+			     height="20" label="Set..." label_selected="Set..." left_delta="94"
 			     mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-126" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="prim info" v_pad="0" width="166">
-				1 Object, 1 Primitive
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 			     mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
@@ -420,7 +417,7 @@
 			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Share with group" left="10"
 			     mouse_opaque="true" name="checkbox share with group"
-			     tool_tip="Allow group members to move, modify, copy and delete."
+			     tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
 			     width="166" />
 			<string name="text deed continued">
 				Deed...
@@ -429,7 +426,7 @@
 				Deed
 			</string>
 			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Deed..." label_selected="Deed..." left_delta="172"
+			     height="20" label="Deed..." label_selected="Deed..." left_delta="172"
 			     mouse_opaque="true" name="button deed" scale_image="TRUE"
 			     tool_tip="Group shared objects can be deeded by a group officer."
 			     width="78" />
@@ -517,37 +514,37 @@
 				</combo_item>
 			</combo_box>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
 			     mouse_opaque="true" name="B:" v_pad="0" width="174">
 				B:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="O:" v_pad="0" width="124">
 				O;
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="G:" v_pad="0" width="74">
 				G:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
 			     mouse_opaque="true" name="E:" v_pad="0" width="174">
 				E:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="N:" v_pad="0" width="124">
 				N:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
 			     mouse_opaque="true" name="F:" v_pad="0" width="74">
 				F:
@@ -764,12 +761,12 @@
 				Skew
 			</text>
 			<spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-			     increment="5" initial_val="0" left="121" max_val="95" min_val="0" 
-			     mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/>
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10"
-			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " />
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+			     mouse_opaque="true" name="Scale 1" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
 			     mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
@@ -888,10 +885,10 @@
 			</text>
 			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
 			     increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-			     mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" />
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     mouse_opaque="true" name="Radius Offset" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
 			     increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-			     mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" />
+			     mouse_opaque="true" name="Revolutions" width="68" />
 			<texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
 			     default_image_name="Default" follows="left|top" height="141"
 			     label="Sculpt Texture" left="121" mouse_opaque="true"
@@ -1192,7 +1189,7 @@
 			     initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
 			     name="rptctrl" width="68" />
 			<button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" label="Apply" label_selected="Apply" left_delta="78"
+			     height="20" label="Apply" label_selected="Apply" left_delta="78"
 			     mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-288" drop_shadow_visible="true" follows="left|top"
@@ -1223,10 +1220,13 @@
 		</panel>
 		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
 		     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-			<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-			      label="New Script..." label_selected="New Script..."
+      <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
+			      label="New Script" label_selected="New Script..."
 			     left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-			     width="130" />
+			     width="100" />
+      <button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
+            label="Permissions..." name="button permissions" font="SansSerif" halign="center"
+            mouse_opaque="true" scale_image="TRUE" />
 			<panel bottom_delta="-330" follows="left|top" height="325"  left="10"
 			     mouse_opaque="true" name="ContentsInventory" width="252" />
 		</panel>
@@ -1236,22 +1236,10 @@
 
 	<panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
 	     name="land info panel" width="272">
+	<!-- Parcel Information -->
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		     bottom="-40" drop_shadow_visible="true" follows="left|top"
 		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-		     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
-			Modify Parcel
-		</text>
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
-		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-		     width="112" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Join..." label_selected="Join..." left="48"
-		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
 		     mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
 			Parcel Information
 		</text>
@@ -1271,12 +1259,27 @@
 		     height="20" label="About Land..." label_selected="About Land..." left="48"
 		     mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
 		<check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
-		     tool_tip="Colour parcels according to their status" font="SansSerifSmall"
-		     height="16" initial_value="false" label="Show Status" left="48" 
+		     tool_tip="Colour parcels according to their ownership" font="SansSerifSmall"
+		     height="16" initial_value="false" label="Show owners" left="48" 
 		     mouse_opaque="true" name="checkbox show owners" width="100" />
 			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
 			     height="18" label="?" label_selected="?" left_delta="94"
 			     mouse_opaque="true" name="button show owners help" width="18" />
+	<!-- Modify Parcel -->
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+		     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
+			Modify Parcel
+		</text>
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
+		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
+		     width="112" />
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Join..." label_selected="Join..." left="48"
+		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
+	<!-- Land Transactions -->
 		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
 		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
@@ -1307,10 +1310,10 @@
 		Click and drag to change view
 	</string>
 	<string name="status_grab">
-		Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
+		Drag to move, Ctrl to lift, Ctrl-Shift to rotate
 	</string>
 	<string name="status_place">
-		Click in the world to create, shift-click to select
+		Click inworld to build
 	</string>
 	<string name="status_selectland">
 		Click and drag to select land
-- 
cgit v1.1


From 5ef87f0115db707483699af0a468945f022fcfc6 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 6 Sep 2009 18:33:23 -0700
Subject: Ported sit anywhere feature from Emerald viewer

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

(limited to 'linden/indra/newview/skins')

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 f837029..5ac1620 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
@@ -884,6 +884,10 @@
                 userdata="QuietSnapshotsToDisk" />
       <on_check control="QuietSnapshotsToDisk" />
     </menu_item_check>
+    <menu_item_call label="Ground Sit" name="Ground Sit" 
+                    shortcut="control|alt|s">
+      <on_click function="Advanced.ToggleSit" userdata="" />
+    </menu_item_call>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
-- 
cgit v1.1


From ad45708178b7e014faad753fab00cd9cd58df5a7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 6 Sep 2009 20:53:19 -0700
Subject: Ported phantom avatar option from Emerald viewer

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

(limited to 'linden/indra/newview/skins')

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 5ac1620..86b5315 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
@@ -888,6 +888,11 @@
                     shortcut="control|alt|s">
       <on_click function="Advanced.ToggleSit" userdata="" />
     </menu_item_call>
+    <menu_item_check label="Phantom Avatar" name="Phantom" 
+                     shortcut="control|alt|p">
+      <on_click function="Advanced.TogglePhantom" userdata="" />
+      <on_check function="Advanced.CheckPhantom" userdata="" />
+    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
-- 
cgit v1.1


From 18e1aead704e0605ceefb9e47db9acdb4c40928e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 6 Sep 2009 21:51:06 -0700
Subject: Added Emerald viewer's animation list

---
 .../default/xui/en-us/floater_animation_list.xml   | 74 ++++++++++++++++++++++
 .../skins/default/xui/en-us/menu_viewer.xml        |  4 ++
 2 files changed, 78 insertions(+)
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
new file mode 100644
index 0000000..be7de86
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+	name="animation list"
+	title="Animation List"
+	can_resize="true"
+	can_minimize="true"
+	can_close="true"
+	can_drag_on_left="false"
+    rect_control="FloaterAnimationListRect"
+	min_width="1000"
+	min_height="275"
+	>
+	<scroll_list
+		    name="animation_list"
+		    left="10"
+		    right="-10"
+		    top="-20"
+		    bottom="100"
+		    column_padding="0"
+		    can_resize="true"
+		    follows="left|top|bottom|right"
+		    draw_heading="true"
+		    multi_select="true"
+		    search_column="1"
+		    tool_tip="Hold shift or control while clicking to select multiple thingers"
+		    >
+		<!-- Icons relating to the avatar, currently: tracking, and marked -->
+		<column name="Anim Name" label="Anim Name" width="250"/>
+    <column name="Animation UUID" label="Animation UUID" width="250"/>
+    <!--<column name="object_name" label="Distance" dynamicwidth="true"/>-->
+		<column name="Source Object UUID" label="Source Object UUID" width="250"/>
+    <column name="Source Owner" label="Source Owner" width="250"/>
+    <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
+	</scroll_list>
+	<panel 
+	       name="options"
+	       left="10"
+	       right="-10"
+         top="90"	
+	       bottom="10"	
+	       border="true"
+	       mouse_opaque="true"
+	       bevel_style="in"
+	       background_visible="true"
+	       background_opaque="true"
+	       follows="left|right|bottom"
+	       bg_opaque_color="0,0,0,0.3"
+	       bg_alpha_color="blue"
+	       can_resize="false"
+	>
+	</panel>
+
+  <button bottom="55" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop Selected" left_delta="5"
+       mouse_opaque="true" name="Stop Selected"
+       tool_tip="Stop selected animations" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Revoke Selected"
+       tool_tip="Revokes animation permissions for object associated with the selections" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop+Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Stop+Revoke Selected"
+       tool_tip="Revokes animation permissions for object(s) associated with the selections, as well as stopping the anim" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Open Owner Profile" left_delta="155"
+       mouse_opaque="true" name="Open Owner Profile"
+       tool_tip="Opens profile of the owner(s) of object(s) associated with the selections" width="150" />
+  <button bottom_delta="-25" enabled="false" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Return Object" left_delta="-465"
+       mouse_opaque="true" name="Return Object"
+       tool_tip="Returns object(s) selected, if you have land powers" width="150" />
+
+</floater>
\ No newline at end of file
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 86b5315..b091be2 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
@@ -893,6 +893,10 @@
       <on_click function="Advanced.TogglePhantom" userdata="" />
       <on_check function="Advanced.CheckPhantom" userdata="" />
     </menu_item_check>
+    <menu_item_check label="Animation List" name="Animation List">
+      <on_click function="ShowFloater" userdata="animation list" />
+      <on_check function="FloaterVisible" userdata="animation list" />
+    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
-- 
cgit v1.1


From 4bbb219eb78fc5d77c86fb7b13f123b52fbef3bc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 6 Sep 2009 23:08:02 -0700
Subject: Added Emerald viewer's asset browser

---
 .../default/xui/en-us/floater_asset_browser.xml    | 29 ++++++++++++++++++++++
 .../skins/default/xui/en-us/menu_viewer.xml        |  5 ++++
 2 files changed, 34 insertions(+)
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
new file mode 100644
index 0000000..13c6b6c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" follows="left|bottom" height="620"
+     hidden="false" left="300" min_height="420" min_width="630"
+     mouse_opaque="true" name="asset browser" title="Asset Browser" width="720">
+	
+	<inventory_panel allow_multi_select="false" border="true" bottom="-299" enabled="true"
+	     follows="left|top" height="280" hidden="false" left="10"
+	     mouse_opaque="true" name="inventory panel"
+	     sort_order="TexturePickerSortOrder" width="231"/>
+
+	<button bottom="-350" follows="left|top" font="SansSerifSmall"
+		halign="center" height="20" hidden="false" label="Next &gt;&gt;"
+		left="160" mouse_opaque="true" name="button next" scale_image="TRUE"
+		width="80"/>
+		
+	<button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+		halign="center" height="20" hidden="false" label="&lt;&lt; Previous"
+		left_delta="0" mouse_opaque="true" name="button previous" scale_image="TRUE"
+		width="80"/>
+		
+	<button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+		halign="center" height="20" hidden="false" label="Refresh"
+		left_delta="0" mouse_opaque="true" name="button refresh" scale_image="TRUE"
+		width="80"/>
+		
+</floater>
+
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 b091be2..5407061 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
@@ -897,6 +897,11 @@
       <on_click function="ShowFloater" userdata="animation list" />
       <on_check function="FloaterVisible" userdata="animation list" />
     </menu_item_check>
+    <menu_item_check label="Asset Browser" name="asset browser" 
+                     shortcut="alt|shift|a">
+      <on_click function="Advanced.ToggleAssetBrowser" userdata="" />
+      <on_check function="Advanced.CheckAssetBrowser" userdata="" />
+    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
-- 
cgit v1.1


From 056f41c8542e60ea57af83bd18caa01db44a15c5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 7 Sep 2009 00:43:37 -0700
Subject: Fixed ground sit menu entry missing check

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

(limited to 'linden/indra/newview/skins')

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 5407061..a53e339 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
@@ -887,6 +887,7 @@
     <menu_item_call label="Ground Sit" name="Ground Sit" 
                     shortcut="control|alt|s">
       <on_click function="Advanced.ToggleSit" userdata="" />
+      <on_Check function="Advanced.CheckSit" userdata="" />
     </menu_item_call>
     <menu_item_check label="Phantom Avatar" name="Phantom" 
                      shortcut="control|alt|p">
-- 
cgit v1.1


From d6973dce3fd453599eccf5519c30672124d622d7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 7 Sep 2009 18:09:25 -0700
Subject: Applied and tweaked last owner in tools window from Emerald viewer

---
 .../skins/default/xui/en-us/floater_tools.xml      | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index d9b51b1..411eec3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -386,20 +386,36 @@
 			     height="20" label="Profile..." label_selected="Profile..." left_delta="94"
 			     mouse_opaque="true" name="button owner profile" scale_image="TRUE"
 			     width="78" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">
+        Last Owner:
+      </text>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+			     mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
+        Thrax Linden
+      </text>
+      <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Profile..." label_selected="Profile..." left_delta="94"
+			     mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
+			     width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-106" drop_shadow_visible="true" follows="left|top"
+			     bottom="-126" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 			     mouse_opaque="true" name="Group:" v_pad="0" width="78">
 				Group:
 			</text>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-106" drop_shadow_visible="true" follows="left|top"
+			     bottom="-126" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
 			     mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
 			     width="88">
 				The Lindens
 			</text>
-			<button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
+			<button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="20" label="Set..." label_selected="Set..." left_delta="94"
 			     mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -425,7 +441,7 @@
 			<string name="text deed">
 				Deed
 			</string>
-			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
+			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="20" label="Deed..." label_selected="Deed..." left_delta="172"
 			     mouse_opaque="true" name="button deed" scale_image="TRUE"
 			     tool_tip="Group shared objects can be deeded by a group officer."
-- 
cgit v1.1


From b4d35c8d24d1095cdb67864b6576ef280b76c646 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Sep 2009 02:31:31 -0700
Subject: Created my own version of Emerald's chat channel tool

---
 .../skins/default/xui/en-us/floater_chat_history.xml     |  6 +++++-
 .../newview/skins/default/xui/en-us/panel_chat_bar.xml   | 10 +++++++---
 .../skins/default/xui/en-us/panel_preferences_chat.xml   | 16 ++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 100c455..dd66a83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -59,10 +59,14 @@
 			<panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
 			     tab_group="1" top="25">
         <string name="gesture_label">Gestures</string>
+        <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
+             increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
+             max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+             width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
 				     enabled="true" follows="left|right|bottom" font="SansSerif"
 				     handle_edit_keys_directly="false" height="20" label="Click here to chat."
-				     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+				     left="105" max_length="254" mouse_opaque="true" name="Chat Editor"
 				     right="-70" select_all_on_focus_received="false" select_on_focus="false"
 				     tab_group="1" />
 				<flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 464ecac..ac3a74a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -8,13 +8,17 @@
 	<button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
 	     label="Local Chat" left="7" name="History"
 	     tool_tip="Click here to see what has been said" width="93" />
+  <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20" 
+			 increment="1.00" initial_val="0" label="Channel" label_width="50" left="107"
+			 max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+			 width="100" tool_tip="Set the default channel for inworld chat"/>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
 	     follows="left|right|bottom" font="SansSerif"
 	     handle_edit_keys_directly="false" height="20" label="Click here to chat."
-	     left="107" max_length="254" name="Chat Editor"
+	     left="212" max_length="254" name="Chat Editor"
 	     select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-	     tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
-	<flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="109"
+	     tool_tip="Press Enter to say, Ctrl-Enter to shout." width="5" />
+	<flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="4"
 	     list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
 	     width="80">
 		<flyout_button_item value="shout" name="shout_item">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 24753d1..0704666 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -131,30 +131,34 @@
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Close chat bar after hitting return" left="148" mouse_opaque="true"
 	     name="close_chat_on_return_check" radio_style="false" width="237" />
-	<check_box bottom_delta="-20" enabled="true"
+	<check_box bottom_delta="-18" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Arrow keys always move avatar when chatting" left="148"
 	     mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
 	     width="237" />
-	<check_box bottom_delta="-20" enabled="true"
+	<check_box bottom_delta="-18" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
 	     name="show_timestamps_check" radio_style="false" width="237" />
-	<check_box bottom_delta="-20" enabled="true"
+	<check_box bottom_delta="-18" enabled="true"
 	     follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 	     label="Play typing animation when chatting" left="148" mouse_opaque="true"
 	     name="play_typing_animation" radio_style="false" width="237" />
+  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false" control_name="ChatChannelSelect"
+       label="Show custom chat channel" left="148" mouse_opaque="true"
+	     name="toggle_channel_control" radio_style="false" width="237" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-369" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
 	     mouse_opaque="false" name="text_box7" v_pad="0" width="128">
 		Bubble Chat:
 	</text>
-	<check_box bottom="-376" control_name="UseChatBubbles" enabled="true" follows="left|top"
+	<check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Show chat bubbles" left="148" mouse_opaque="true"
 	     name="bubble_text_chat" radio_style="false" width="237" />
-	<slider bottom="-392" can_edit_text="false" control_name="ChatBubbleOpacity"
+	<slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
 	     decimal_digits="3" enabled="true" follows="left|top" height="12"
 	     increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
 	     min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
-- 
cgit v1.1


From 9627eac5c07c9e1f2b3be34f942af445414c14c5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Sep 2009 05:45:37 -0700
Subject: New chat channel preference should change only on apply

---
 linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 0704666..b0384cf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -145,7 +145,7 @@
 	     label="Play typing animation when chatting" left="148" mouse_opaque="true"
 	     name="play_typing_animation" radio_style="false" width="237" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false" control_name="ChatChannelSelect"
+	     font="SansSerifSmall" height="16" initial_value="false" 
        label="Show custom chat channel" left="148" mouse_opaque="true"
 	     name="toggle_channel_control" radio_style="false" width="237" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-- 
cgit v1.1


From 9538caa2a5c84a123cc5e918158f0369cb580507 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Sep 2009 05:56:21 -0700
Subject: Commented out permissions button (todo: backport this if there's
 time)

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

(limited to 'linden/indra/newview/skins')

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 411eec3..bc18f44 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1240,9 +1240,9 @@
 			      label="New Script" label_selected="New Script..."
 			     left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
 			     width="100" />
-      <button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
+      <!--<button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
             label="Permissions..." name="button permissions" font="SansSerif" halign="center"
-            mouse_opaque="true" scale_image="TRUE" />
+            mouse_opaque="true" scale_image="TRUE" />-->
 			<panel bottom_delta="-330" follows="left|top" height="325"  left="10"
 			     mouse_opaque="true" name="ContentsInventory" width="252" />
 		</panel>
-- 
cgit v1.1