From ec58a6b2a37e63fb7768daedbb320d44062dbbfa Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Fri, 1 Jul 2011 22:43:55 -0400
Subject: [PATCH] FIRE 1050,1851,1707  Starlight skin fixes for landmarks and
 quickprefs, by Hitomi Tiponi

---
 .../skins/default/xui/en/panel_landmarks.xml  |  59 ++++++++++--------
 .../skins/starlight/textures/textures.xml     |   1 +
 .../textures/bottomtray/phoenix_18.png        | Bin 0 -> 3375 bytes
 .../textures/bottomtray/phoenix_18.png        | Bin 0 -> 3375 bytes
 .../textures/bottomtray/phoenix_18.png        | Bin 0 -> 3375 bytes
 .../textures/bottomtray/phoenix_18.png        | Bin 0 -> 3368 bytes
 .../textures/bottomtray/phoenix_18.png        | Bin 0 -> 3368 bytes
 .../starlight/xui/en/panel_bottomtray.xml     |  56 +++++++++++++----
 8 files changed, 79 insertions(+), 37 deletions(-)
 create mode 100644 indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/phoenix_18.png
 create mode 100644 indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/phoenix_18.png
 create mode 100644 indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/phoenix_18.png
 create mode 100644 indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/phoenix_18.png
 create mode 100644 indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/phoenix_18.png

diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 77695b0cd6..085663ec7e 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -103,36 +103,36 @@
              width="307"/>
         </panel>
     </tab_container>
-    <panel
-       background_visible="true"
+ <panel
+     background_visible="true"
      bevel_style="none"
-     bottom="0"
+     bottom="3"
      follows="left|right|bottom"
      height="27"
      layout="bottomleft"
+	 auto_resize="true"
      left="3"
      name="bottom_panel"
      width="313">
-
-     	  <layout_stack
-		   animate="false"
-		   border_size="0"
-		   follows="left|right|bottom"
+     	  <panel
+   		  border_size="0"
+		   follows="top|left|right"
 		   height="25"
 		   layout="topleft"
-		   orientation="horizontal"
 		   top_pad="1"
 		   left="0"
 		   name="bottom_panel"
 		   width="307">
-		      <layout_panel
+		      <panel
 		       auto_resize="false"
 		       height="25"
 		       layout="topleft"
+			   follows="top|left"
+			   left="0"
 		       name="options_gear_btn_panel"
-		       user_resize="false"
-		       width="32">
-		          <button
+		       width="32"
+               user_resize="false">
+		          <menu_button
 		           follows="bottom|left"
 		           tool_tip="Show additional options"
 		           height="25"
@@ -145,13 +145,15 @@
 		           name="options_gear_btn"
 		           top="0"
 		           width="31" />
-		      </layout_panel>
-		      <layout_panel
+		      </panel>
+		      <panel
 		       auto_resize="false"
 		       height="25"
 		       layout="topleft"
+			   follows="top|left"
+			   left_pad="0"
 		       name="add_btn_panel"
-		       user_resize="false"
+               user_resize="false"
 		       width="32">
 		          <button
 		           follows="bottom|left"
@@ -166,13 +168,16 @@
 		           tool_tip="Add new landmark"
 		           top="0"
 		           width="31" />
-		      </layout_panel>
-		      <layout_panel
+		      </panel>
+		      <panel
 		       auto_resize="true"
 		       height="25"
 		       layout="topleft"
+			   follows="top|left|right"
+			   left_pad="0"
 		       name="dummy_panel"
-		       user_resize="false"
+               user_resize="false"
+			   min_width="1"
 		       width="212">
 		          <icon
 		           follows="bottom|left|right"
@@ -183,16 +188,18 @@
 		           top="0"
 		           name="dummy_icon"
 		           width="211" />
-		      </layout_panel>
-		      <layout_panel
+		      </panel>
+		      <panel
 		       auto_resize="false"
 		       height="25"
 		       layout="topleft"
 		       name="trash_btn_panel"
-		       user_resize="false"
+			   follows="top|right"
+			   left_pad="0"
+               user_resize="false"
 		       width="31">
 		          <dnd_button
-		           follows="bottom|left"
+		           follows="bottom|right"
 		           height="25"
 		           image_hover_unselected="Toolbar_Right_Over"
 		           image_overlay="TrashItem_Off"
@@ -204,7 +211,9 @@
 		           tool_tip="Remove selected landmark"
 		           top="0"
 		           width="31"/>
-		      </layout_panel>
-  	</layout_stack>
+		      </panel>
+  	</panel>
    </panel>
 </panel>
+
+
diff --git a/indra/newview/skins/starlight/textures/textures.xml b/indra/newview/skins/starlight/textures/textures.xml
index 0c67f529f5..e3cae3f1a5 100644
--- a/indra/newview/skins/starlight/textures/textures.xml
+++ b/indra/newview/skins/starlight/textures/textures.xml
@@ -760,6 +760,7 @@ with the same filename but different name
   <texture name="teleport_icon_24x24" file_name="icons/genie_icon_24x24.png" preload="false" />
   <texture name="friends_icon_24x24" file_name="icons/Friends_Icon_24x24.png" preload="false" />
   <texture name="gift_icon_24x24" file_name="icons/gift_icon_24x24.png" preload="false" />
+  <texture name="phoenix_18" file_name="bottomtray/phoenix_18.png" preload="false" />
 
 <!-- StarLight Textures - rationalise with sections above -->
 
diff --git a/indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/nostalgia_blue/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..f50de38c0623b1fd4621a628f3cb429115e6b153
GIT binary patch
literal 3375
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
FV1f)UO{M?<

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/original_orange/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..f50de38c0623b1fd4621a628f3cb429115e6b153
GIT binary patch
literal 3375
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
FV1f)UO{M?<

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/original_teal/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..f50de38c0623b1fd4621a628f3cb429115e6b153
GIT binary patch
literal 3375
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
FV1f)UO{M?<

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/silver_blue/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6b830a96b1e443575f393fc43f33db96b9d91f5
GIT binary patch
literal 3368
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

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/phoenix_18.png b/indra/newview/skins/starlight/themes/silver_pink/textures/bottomtray/phoenix_18.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6b830a96b1e443575f393fc43f33db96b9d91f5
GIT binary patch
literal 3368
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

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
index 2e152e0b2a..43f01d3fdd 100644
--- a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
@@ -104,18 +104,17 @@
             <gesture_combo_list
              follows="left|right"
              height="26"
-             image_pressed="PushButton_Press"
-             image_pressed_selected="PushButton_Selected_Press"
-             image_selected="PushButton_Selected_Press"
              layout="topleft"
-             left="0"
              name="Gesture"
              tool_tip="Shows/hides gestures"
              top="5"
              width="42">
                 <combo_button
-				image_overlay="Gesture_btn"
-                 pad_right="10"
+                 height="26"
+                 image_overlay="Gesture_btn"
+             	 image_pressed="PushButton_Press"
+             	 image_pressed_selected="PushButton_Selected_Press"
+             	 image_selected="PushButton_Selected_Press"
                  use_ellipses="true" />
                 <combo_list
                  page_lines="17" />
@@ -133,6 +132,7 @@
          layout="topleft"
          min_height="28"
          min_width="59"
+		 left_delta="0"
          mouse_opaque="false"
          name="speak_panel"
          top_delta="0"
@@ -536,9 +536,8 @@
                  parameter="mini_map" />
             </bottomtray_button>
         </layout_panel>
-
-<!--        
-         <layout_panel
+      
+         <!-- layout_panel
          mouse_opaque="false"
          auto_resize="false"
          follows="left|right"
@@ -568,8 +567,7 @@
                  function="Button.SetDockableFloaterToggle"
                  parameter="inventory" />
             </button>
-        </layout_panel>
--->
+        </layout_panel -->
 
         <layout_panel
          auto_resize="false"
@@ -647,7 +645,41 @@
          parameter="animation_overrider" />
       </bottomtray_button>
         </layout_panel>
-<!-- ## Zi: AO button -->      
+<!-- ## Zi: AO button -->   
+
+<!-- Quick Preferences panel    -WoLf -->
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="43"
+         mouse_opaque="false"
+         name="quickprefs_btn_panel"
+         user_resize="false"
+         width="43">
+       <bottomtray_button
+        name="quickprefs_toggle"
+        tool_tip="Shows/hides the Quick Preferences Panel"
+        left="0"
+        top="5"
+        height="26"
+        width="40"
+        layout="topleft"
+        follows="left|right"
+        image_pressed="PushButton_Press"
+        image_pressed_selected="PushButton_Selected_Press"
+        image_selected="PushButton_Selected_Press"
+        image_overlay="phoenix_18"
+        is_toggle="true"
+        tab_stop="true">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="quickprefs" />
+      </bottomtray_button>
+        </layout_panel>
+<!-- Quick Preferences panel    -WoLf -->   
 
         <icon
          auto_resize="false"