From 668307e4e3b59ac4f4f955aa0d36183c361352b8 Mon Sep 17 00:00:00 2001
From: Robin Cornelius <none@none>
Date: Wed, 23 Feb 2011 15:50:55 -0500
Subject: STORM-1019 Add ability to display beacons for Media on a Prim objects
 Changes merged into viewer 2 by Jonathan Yap

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a010524091..d8b23d9d88 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12069,6 +12069,17 @@
       <key>Value</key>
       <real>0.40000000596</real>
     </map>
+	<key>moapbeacon</key>
+	<map>
+		<key>Comment</key>
+		<string>Beacon / Highlight media on a prim sources</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
     <key>particlesbeacon</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From d9015a836f59c228818dc85e37ef4807b2d1b181 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 16 Mar 2011 18:32:28 -0400
Subject: STORM-1077 Change "Voice Enabled/Disabled" to "Speak Button"

---
 indra/newview/app_settings/ignorable_dialogs.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml
index 89fd4e5935..f6f4d5faa4 100644
--- a/indra/newview/app_settings/ignorable_dialogs.xml
+++ b/indra/newview/app_settings/ignorable_dialogs.xml
@@ -122,7 +122,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-
+    <key>FirstSpeak</key>
+    <map>
+      <key>Comment</key>
+      <string>Shows hint for Speak button</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>FirstSit</key>
     <map>
       <key>Comment</key>
@@ -132,7 +142,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>AboutDirectX9</key>
     <map>
-- 
cgit v1.2.3


From dbeb78aee24bc2aa9c3cabd9b51b1bbed4131ef0 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 16 Mar 2011 18:34:59 -0400
Subject: STORM-1077 Fix setting for Sit hint, changed by accident during
 testing

---
 indra/newview/app_settings/ignorable_dialogs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml
index f6f4d5faa4..17d3d3c9c5 100644
--- a/indra/newview/app_settings/ignorable_dialogs.xml
+++ b/indra/newview/app_settings/ignorable_dialogs.xml
@@ -142,7 +142,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AboutDirectX9</key>
     <map>
-- 
cgit v1.2.3