From 34a79a6ece28fbc560bde907142ecaadf95e910f Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sun, 30 Nov 2014 07:15:00 -0500
Subject: STORM-2082 Implement delete floater

---
 indra/newview/skins/default/xui/en/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5dcb8e2cdf..a763e3ee2f 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4041,5 +4041,8 @@ Try enclosing path to the editor with double quotes.
   <string name="loading_chat_logs">
     Loading...
   </string>
-  
+
+  <!-- Presets graphic/camera -->
+  <string name="preset_combo_label">-None saved yet-</string>
+
   </strings>
-- 
cgit v1.2.3


From 77b9793c2eb357184aedee85000c90c4b1c3e574 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Mon, 1 Dec 2014 20:36:09 -0500
Subject: STORM-2082 Improve text in notifications. Disable delete button when
 thre is nothing to be deleted.

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

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a763e3ee2f..1c655c6559 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4043,6 +4043,6 @@ Try enclosing path to the editor with double quotes.
   </string>
 
   <!-- Presets graphic/camera -->
-  <string name="preset_combo_label">-None saved yet-</string>
+  <string name="preset_combo_label">-Empty list-</string>
 
   </strings>
-- 
cgit v1.2.3


From 8d12072979ee46a1eb2d13fdfef8bef62ff3f619 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 12 Dec 2014 11:13:11 -0500
Subject: STORM-2082 Merge Hardware floater into main graphics preferences
 display Change notifications so they are emitted only when an error occurs
 Put active preset at top of list Add Maximum ARC slider Merge two small
 methods into slider update code

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

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1c655c6559..023c6e5bbb 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4044,5 +4044,6 @@ Try enclosing path to the editor with double quotes.
 
   <!-- Presets graphic/camera -->
   <string name="preset_combo_label">-Empty list-</string>
-
+  <string name="Default">Default</string>
+  <string name="Off">Off</string>
   </strings>
-- 
cgit v1.2.3


From 611391a818746f560ad49847ae643613313ac216 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 20 Jan 2015 09:17:23 -0500
Subject: STORM-2082 Update to new UI design.  Bugs are not worked out yet.

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

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 023c6e5bbb..c09129c867 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4046,4 +4046,5 @@ Try enclosing path to the editor with double quotes.
   <string name="preset_combo_label">-Empty list-</string>
   <string name="Default">Default</string>
   <string name="Off">Off</string>
+  <string name="none_paren_cap">(None)</string>
   </strings>
-- 
cgit v1.2.3


From 45b59881ebcc19510c7e36398232f057366eb41d Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 3 Feb 2015 08:37:31 -0500
Subject: STORM-2082 Reformat preset floaters. Remove Impostor checkbox. That
 control is now merged into the right side of the impostors slider. Maximum
 ARC still depends on impostors being enabled.  Once that dependency is
 removed in llvoavatar then it will be necessary to reflect that change in the
 UI code.

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

(limited to 'indra/newview/skins/default/xui/en/strings.xml')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c09129c867..c0a8866549 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4045,6 +4045,6 @@ Try enclosing path to the editor with double quotes.
   <!-- Presets graphic/camera -->
   <string name="preset_combo_label">-Empty list-</string>
   <string name="Default">Default</string>
-  <string name="Off">Off</string>
   <string name="none_paren_cap">(None)</string>
+  <string name="no_limit">No Limit</string>
   </strings>
-- 
cgit v1.2.3