From 1bb46c7384f6532da8f0315f61b8613bd0b9b717 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 16 Feb 2011 17:02:06 -0800
Subject: SOCIAL-544 PARTIAL move skylight skin to viewer repo

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 236 +++++++++++++++++++++++
 1 file changed, 236 insertions(+)
 create mode 100644 indra/newview/skins/minimal/xui/en/main_view.xml

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
new file mode 100644
index 0000000000..88f06d9e63
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|right|top|bottom"
+ height="768"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ tab_stop="false" 
+ name="main_view"
+ width="1024">
+  <panel top="0"
+   follows="all"
+   height="768"
+   mouse_opaque="false"
+   name="login_panel_holder"
+   width="1024"/>
+ 
+  <layout_stack border_size="0"
+                follows="all"
+                mouse_opaque="false"
+                height="768"
+                name="menu_stack"
+                orientation="vertical"
+                top="0">
+    <layout_panel auto_resize="false"
+                  height="0"
+                  mouse_opaque="false"
+                  name="nav_bar_container"
+                  tab_stop="false"
+                  min_height="0" 
+                  width="1024"
+                  user_resize="false" 
+                  visible="true">
+    </layout_panel>
+    <layout_panel auto_resize="true"
+                  follows="all"
+                  height="500"
+                  layout="topleft"
+                  mouse_opaque="false"
+                  tab_stop="false" 
+                  name="hud"
+                  width="1024">
+      <layout_stack border_size="0"
+                    follows="all"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="hud_stack"
+                    orientation="horizontal"
+                    top="0"
+                    width="1024">
+        <layout_panel auto_resize="true"
+               follows="all"
+               height="500"
+               layout="topleft"
+               mouse_opaque="false"
+               tab_stop="false"
+               name="non_side_tray_view"
+               user_resize="false"
+               width="500">
+
+          <layout_stack border_size="0"
+                        bottom="500"
+                        follows="all"
+                        height="500"
+                        left="0"
+                        mouse_opaque="false"
+                        name="world_stack"
+                        open_time_constant="0.03"
+                        close_time_constant="0.03" 
+                        orientation="vertical">
+            <layout_panel auto_resize="true"
+                          follows="all"
+                          height="500"
+                          layout="topleft"
+                          tab_stop="false"
+                          mouse_opaque="false"
+                          user_resize="false" 
+                          name="hud container"
+                          width="500">
+              <panel follows="left|top"
+                     height="0"
+                     left="0"
+                     mouse_opaque="false"
+                     name="topinfo_bar_container"
+                     tab_stop="false"
+                     top="0"
+                     visible="false"
+                     width="1024"/>
+              <panel bottom="500"
+                     follows="left|right|bottom"
+                     height="25"
+                     left="0"
+                     mouse_opaque="false"
+                     tab_stop="false"
+                     name="stand_stop_flying_container"
+                     visible="false"
+                     width="500"/>
+              <panel follows="all"
+										 height="500"
+										 left="0"
+										 mouse_opaque="false"
+										 name="floater_view_holder"
+										 tab_group="-1"
+										 tab_stop="false"
+										 top="0"
+										 width="500">
+                <floater_view follows="all"
+															height="500"
+															left="0"
+															mouse_opaque="false"
+															name="Floater View"
+															tab_group="-1"
+															tab_stop="false"
+															top="0"
+															width="500"/>
+              </panel>
+              <panel bottom="500"
+                    follows="all"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="world_view_rect"
+                    width="500">
+                <icon name="sl_watermark"
+                      image_name="sl_logo.png"
+                      left="5"
+                      top="5"
+                      width="100"
+                      height="45"/>
+              </panel>
+            </layout_panel>
+            <layout_panel auto_resize="false"
+                   min_height="33"
+                   height="33" 
+                   mouse_opaque="false"
+                   name="bottom_tray_container"
+                   visible="false"/>
+            <layout_panel auto_resize="false"
+                          height="195"
+                          mouse_opaque="false"
+                          user_resize="false"
+                          name="avatar_picker_and_destination_guide_container"
+                          visible="false">
+              <panel top="0"
+                     height="195"
+                     left="0"
+                     background_visible="true" 
+                     width="500"
+                     follows="all">
+                <web_browser
+                  top="0"
+                  height="195"
+                  follows="all"
+                  name="destination_guide_contents"
+                  trusted_content="true"
+                  visible="false"
+                  start_url="http://interest.secondlife/viewer/guide"/>
+                <web_browser
+                  top="0"
+                  height="195"
+                  follows="all"
+                  name="avatar_picker_contents"
+                  visible="false"
+                  trusted_content="true"
+                  start_url="http://interest.secondlife/viewer/avatar"/>
+              </panel>
+            </layout_panel>
+          </layout_stack>
+        </layout_panel>
+      </layout_stack>
+      <debug_view follows="all"
+                  left="0"
+                  top="0"
+                  mouse_opaque="false"
+                  height="500"
+                  name="DebugView"
+                  width="1024"/>
+    </layout_panel>
+  </layout_stack>
+  <panel top="0"
+        follows="all"
+        mouse_opaque="false"
+        left="0"
+        name="snapshot_floater_view_holder" 
+        width="1024"
+        height="798">
+    <snapshot_floater_view enabled="false"
+                           follows="all"
+                           height="768"
+                           left="0"
+                           mouse_opaque="false"
+                           name="Snapshot Floater View"
+                           tab_stop="false"
+                           top="0"
+                           visible="false"
+                           width="1024"/>
+  </panel>
+  <panel top="0"
+         follows="all"
+         height="768"
+         mouse_opaque="false"
+         name="popup_holder"
+         class="popup_holder"
+         width="1024">
+  </panel>
+  <view top="0"
+        left="0"
+        width="1024"
+        height="768"
+        name="hint_holder"
+        mouse_opaque="false"
+        follows="all"/>
+  <panel top="0"
+         follows="all"
+         height="768"
+         mouse_opaque="true"
+         name="progress_view"
+         filename="panel_progress.xml"
+         class="progress_view"
+         width="1024"
+         visible="false"/>
+  <menu_holder top="0"
+               follows="all"
+               height="768"
+               mouse_opaque="false"
+               name="Menu Holder"
+               width="1024"/>
+  <tooltip_view top="0"
+                follows="all"
+                height="768"
+                mouse_opaque="false"
+                name="tooltip view"
+                tab_group="-2"
+                width="1024"/>
+</panel>
-- 
cgit v1.2.3


From f3238a700eb387dc87d75c2ee0032ecad9e29b54 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 23 Feb 2011 16:41:46 -0800
Subject: remove skylight progress screen and unused skylight textures

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 88f06d9e63..629496db81 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -121,14 +121,7 @@
                     left="0"
                     mouse_opaque="false"
                     name="world_view_rect"
-                    width="500">
-                <icon name="sl_watermark"
-                      image_name="sl_logo.png"
-                      left="5"
-                      top="5"
-                      width="100"
-                      height="45"/>
-              </panel>
+                    width="500"/>
             </layout_panel>
             <layout_panel auto_resize="false"
                    min_height="33"
-- 
cgit v1.2.3


From 598ee92b0e43748f065b82aa33404550c32dc3c4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 11:06:42 -0800
Subject: SOCIAL-551 WIP Add buttons to open people and profile windows bring
 back sidetray container in minimal skin

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 629496db81..1fadd2d550 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -161,6 +161,16 @@
             </layout_panel>
           </layout_stack>
         </layout_panel>
+        <layout_panel auto_resize="false"
+                      follows="top|bottom"
+                      height="500"
+                      min_width="333"
+                      mouse_opaque="false"
+                      tab_stop="false"
+                      name="side_tray_container"
+                      user_resize="false"
+                      visible="false"
+                      width="333"/>
       </layout_stack>
       <debug_view follows="all"
                   left="0"
-- 
cgit v1.2.3


From 098145b15570b2f5b0358edc329d4852f226eba0 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 18:39:19 -0800
Subject: SOCIAL-551 WIP add buttons to open people and profile windows people
 button now shows people window

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 39 ++++++++++--------------
 1 file changed, 16 insertions(+), 23 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 1fadd2d550..85e1045357 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -40,16 +40,7 @@
                   tab_stop="false" 
                   name="hud"
                   width="1024">
-      <layout_stack border_size="0"
-                    follows="all"
-                    height="500"
-                    left="0"
-                    mouse_opaque="false"
-                    name="hud_stack"
-                    orientation="horizontal"
-                    top="0"
-                    width="1024">
-        <layout_panel auto_resize="true"
+        <panel auto_resize="false"
                follows="all"
                height="500"
                layout="topleft"
@@ -57,7 +48,7 @@
                tab_stop="false"
                name="non_side_tray_view"
                user_resize="false"
-               width="500">
+               width="1024">
 
           <layout_stack border_size="0"
                         bottom="500"
@@ -160,18 +151,7 @@
               </panel>
             </layout_panel>
           </layout_stack>
-        </layout_panel>
-        <layout_panel auto_resize="false"
-                      follows="top|bottom"
-                      height="500"
-                      min_width="333"
-                      mouse_opaque="false"
-                      tab_stop="false"
-                      name="side_tray_container"
-                      user_resize="false"
-                      visible="false"
-                      width="333"/>
-      </layout_stack>
+        </panel>
       <debug_view follows="all"
                   left="0"
                   top="0"
@@ -181,6 +161,19 @@
                   width="1024"/>
     </layout_panel>
   </layout_stack>
+  <panel follows="top|bottom"
+         height="500"
+         mouse_opaque="false"
+         tab_stop="false"
+         name="hidden_side_tray"
+         visible="false"
+         width="333">
+    <panel
+      name="side_tray_container"
+      width="333"
+      height="500"/>
+  </panel>
+
   <panel top="0"
         follows="all"
         mouse_opaque="false"
-- 
cgit v1.2.3


From 5e0305ce4ce4448a9d2251dd9691f37c7b7945e1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 24 Feb 2011 19:23:18 -0800
Subject: SOCIAL-577 WIP create streamlined navigation bar made navigation bar
 appear in basic skin, with simplified UI

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 85e1045357..6e37266eff 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -23,7 +23,7 @@
                 orientation="vertical"
                 top="0">
     <layout_panel auto_resize="false"
-                  height="0"
+                  height="30"
                   mouse_opaque="false"
                   name="nav_bar_container"
                   tab_stop="false"
@@ -112,6 +112,7 @@
                     left="0"
                     mouse_opaque="false"
                     name="world_view_rect"
+                     top="0" 
                     width="500"/>
             </layout_panel>
             <layout_panel auto_resize="false"
-- 
cgit v1.2.3


From 69a84d1e4cd25d6b440cffc1306604c45100475b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 09:58:56 -0800
Subject: remove flicker from top of world view

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 6e37266eff..89afb302a8 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -43,6 +43,7 @@
         <panel auto_resize="false"
                follows="all"
                height="500"
+               top="0" 
                layout="topleft"
                mouse_opaque="false"
                tab_stop="false"
@@ -55,6 +56,7 @@
                         follows="all"
                         height="500"
                         left="0"
+                        top="0" 
                         mouse_opaque="false"
                         name="world_stack"
                         open_time_constant="0.03"
-- 
cgit v1.2.3


From 31d0bf5ba5dd5e1df6c42dd19ce63ef3978a2f4c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 13:48:20 -0800
Subject: updates destination guide and avatar picker urls added close button
 to destination guide and avatar picker

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 89afb302a8..2a3107398d 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -124,20 +124,20 @@
                    name="bottom_tray_container"
                    visible="false"/>
             <layout_panel auto_resize="false"
-                          height="195"
+                          height="200"
                           mouse_opaque="false"
                           user_resize="false"
                           name="avatar_picker_and_destination_guide_container"
                           visible="false">
               <panel top="0"
-                     height="195"
+                     height="200"
                      left="0"
                      background_visible="true" 
                      width="500"
                      follows="all">
                 <web_browser
                   top="0"
-                  height="195"
+                  height="200"
                   follows="all"
                   name="destination_guide_contents"
                   trusted_content="true"
@@ -145,12 +145,24 @@
                   start_url="http://interest.secondlife/viewer/guide"/>
                 <web_browser
                   top="0"
-                  height="195"
+                  height="200"
                   follows="all"
                   name="avatar_picker_contents"
                   visible="false"
                   trusted_content="true"
                   start_url="http://interest.secondlife/viewer/avatar"/>
+                <button
+                  name="close"
+                  width="22"
+                  height="23"
+                  right="-10" 
+                  top="2" 
+                  follows="top|right" 
+                  chrome="true" 
+                  tab_stop="false" 
+                  image_unselected="bottomtray_close_off"
+                  image_selected="bottomtray_close_press"
+                  />
               </panel>
             </layout_panel>
           </layout_stack>
-- 
cgit v1.2.3


From 4619a1e58bd53307bf5b2e326d814eddad73fbb1 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 25 Feb 2011 15:13:21 -0800
Subject: SOCIAL-550 FIX Add back media volume and play/pause buttons to top
 bar SOCIAL-577 FIX create streamlined navigation bar

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 2a3107398d..5906205636 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -176,6 +176,15 @@
                   width="1024"/>
     </layout_panel>
   </layout_stack>
+  <panel mouse_opaque="false"
+       follows="right|top"
+       name="status_bar_container"
+       tab_stop="false"
+       height="30"
+       left="-70"
+       top="0"
+       width="70"
+       visible="false"/>
   <panel follows="top|bottom"
          height="500"
          mouse_opaque="false"
-- 
cgit v1.2.3


From 7e3f9d3f836b8f161ecc63edcdfc21133e1a5c24 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 28 Feb 2011 16:15:54 -0800
Subject: SOCIAL-554 FIX Allow right click of other avatars removed object
 profile option added back resize corner

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 5906205636..18fa332209 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -223,6 +223,13 @@
          name="popup_holder"
          class="popup_holder"
          width="1024">
+    <icon follows="right|bottom"
+      image_name="Resize_Corner"
+      right="-1"
+      name="resize_corner"
+      width="11"
+      bottom="-1"
+      height="11" />
   </panel>
   <view top="0"
         left="0"
-- 
cgit v1.2.3


From 92403b4ea1c02d378a1157e8912f1e3976ba3772 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 2 Mar 2011 21:05:03 -0800
Subject: SOCIAL-593 FIX Profile Window cannot be resized in minimal skin
 floater view snapping rectangle is now driven by floater_snap_region view

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 18fa332209..a2c16fc9e2 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -71,6 +71,13 @@
                           user_resize="false" 
                           name="hud container"
                           width="500">
+              <view top="0"
+                    follows="all"
+                    height="500"
+                    left="0"
+                    mouse_opaque="false"
+                    name="floater_snap_region"
+                    width="500"/>
               <panel follows="left|top"
                      height="0"
                      left="0"
-- 
cgit v1.2.3


From 25ad57c4b6db3793a0bb6fc1901ea6b0e969c17f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 4 Mar 2011 00:40:38 -0800
Subject: SOCIAL-603 FIX Move how to button to bottom bar moves scrollbar up
 from bottom of screen to leave room for resize thumb

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index a2c16fc9e2..1cc02006f2 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -131,13 +131,13 @@
                    name="bottom_tray_container"
                    visible="false"/>
             <layout_panel auto_resize="false"
-                          height="200"
+                          height="215"
                           mouse_opaque="false"
                           user_resize="false"
                           name="avatar_picker_and_destination_guide_container"
                           visible="false">
               <panel top="0"
-                     height="200"
+                     height="215"
                      left="0"
                      background_visible="true" 
                      width="500"
-- 
cgit v1.2.3


From 93c38d04a1cea317b8083010694d840f76bbc2ec Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 7 Mar 2011 17:02:18 -0800
Subject: updated destination and avatar urls

---
 indra/newview/skins/minimal/xui/en/main_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/minimal/xui/en/main_view.xml')

diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 1cc02006f2..45ba785c1f 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -148,16 +148,14 @@
                   follows="all"
                   name="destination_guide_contents"
                   trusted_content="true"
-                  visible="false"
-                  start_url="http://interest.secondlife/viewer/guide"/>
+                  visible="false"/>
                 <web_browser
                   top="0"
                   height="200"
                   follows="all"
                   name="avatar_picker_contents"
                   visible="false"
-                  trusted_content="true"
-                  start_url="http://interest.secondlife/viewer/avatar"/>
+                  trusted_content="true"/>
                 <button
                   name="close"
                   width="22"
-- 
cgit v1.2.3