From f72115059e7b1450e221a8006d2030ac35767b5a Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 21 Sep 2011 17:57:49 -0700
Subject: EXP-1230 FIX As a resident, I want to not have to choose a UI mode
 for existing configs that point to settings_minimal.xml, make it a valid, but
 empty file

---
 indra/newview/app_settings/settings_minimal.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 indra/newview/app_settings/settings_minimal.xml

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
new file mode 100644
index 0000000000..01a70f2671
--- /dev/null
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -0,0 +1 @@
+<llsd/>
\ No newline at end of file
-- 
cgit v1.2.3


From 7e308b551c7fde9178e354dba005a5b35f793245 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 21 Sep 2011 18:48:39 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room initial
 pass at wrapping

---
 indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 55cfd462ac..138322eca7 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -13,15 +13,12 @@
            width="500"
            left="0"
            top="20"
-           orientation="horizontal">
-    <button width="0"
-            auto_resize="true"
+           side="top">
+    <button auto_resize="true"
             label="Button 1"/>
-    <button width="0"
-            auto_resize="true"
+    <button auto_resize="true"
             label="Button with long label"/>
-    <button width="0"
-            auto_resize="true"
+    <button auto_resize="true"
             label="Button with longest label of all"/>
   </toolbar>
   <toolbar name="test_toolbar_vertical"
@@ -30,7 +27,7 @@
            width="100"
            left="0"
            top="70"
-           orientation="vertical">
+           side="left">
     <button height="30"
             label="Button 1"/>
     <button height="50"
-- 
cgit v1.2.3


From d9b96097cd67f1d72410c262973ac67fd0f82493 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 21 Sep 2011 18:48:51 -0700
Subject: EXP-1239 WIP make toolbars wrap when there is not enough room initial
 pass at wrapping

---
 indra/newview/skins/default/xui/en/widgets/toolbar.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/toolbar.xml

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
new file mode 100644
index 0000000000..a7f73c0c7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toolbar background_image = "Rounded_Rect">
+  <button_icon_and_text
+    follows="none"
+    height="30"
+    chrome="true"
+    auto_resize="true"
+    />
+  <button_icon
+  follows="none"
+  height="30"
+  chrome="true"
+  auto_resize="true"
+    />
+</toolbar>
-- 
cgit v1.2.3