summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorbea@american.lindenlab.com <bea@american.lindenlab.com>2009-12-04 13:29:05 -0800
committerbea@american.lindenlab.com <bea@american.lindenlab.com>2009-12-04 13:29:05 -0800
commitdab659adea63c744aa72c27935f62cce91d8ab7a (patch)
tree8bcc1d3b5ebb46e64efc4ff784e5e27844f01da0 /indra/newview/app_settings
parent67d051e78cb9f7d1ba670b647229ac9974fb7896 (diff)
parentbef221e3aa42b92586e5783811742afdbf05cd92 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml50
1 files changed, 36 insertions, 14 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4a65b40658..b301d784f9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1374,6 +1374,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>ChatWindow</key>
+ <map>
+ <key>Comment</key>
+ <string>Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>CheesyBeacon</key>
<map>
<key>Comment</key>
@@ -3695,7 +3706,18 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.15</real>
+ <real>0.5</real>
+ </map>
+ <key>InspectorShowTime</key>
+ <map>
+ <key>Comment</key>
+ <string>Stay timing for inspectors</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>3.0</real>
</map>
<key>InstallLanguage</key>
<map>
@@ -7956,7 +7978,7 @@
<key>ShowPGSearchAll</key>
<map>
<key>Comment</key>
- <string>Display results of search All that are flagged as PG</string>
+ <string>Display results of search All that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -7969,7 +7991,7 @@
<key>ShowMatureSearchAll</key>
<map>
<key>Comment</key>
- <string>Display results of search All that are flagged as mature</string>
+ <string>Display results of search All that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -7995,7 +8017,7 @@
<key>ShowPGGroups</key>
<map>
<key>Comment</key>
- <string>Display results of find groups that are flagged as PG</string>
+ <string>Display results of find groups that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8008,7 +8030,7 @@
<key>ShowMatureGroups</key>
<map>
<key>Comment</key>
- <string>Display results of find groups that are flagged as mature</string>
+ <string>Display results of find groups that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8034,7 +8056,7 @@
<key>ShowPGClassifieds</key>
<map>
<key>Comment</key>
- <string>Display results of find classifieds that are flagged as PG</string>
+ <string>Display results of find classifieds that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8047,7 +8069,7 @@
<key>ShowMatureClassifieds</key>
<map>
<key>Comment</key>
- <string>Display results of find classifieds that are flagged as mature</string>
+ <string>Display results of find classifieds that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8073,7 +8095,7 @@
<key>ShowPGEvents</key>
<map>
<key>Comment</key>
- <string>Display results of find events that are flagged as PG</string>
+ <string>Display results of find events that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8086,7 +8108,7 @@
<key>ShowMatureEvents</key>
<map>
<key>Comment</key>
- <string>Display results of find events that are flagged as mature</string>
+ <string>Display results of find events that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8112,7 +8134,7 @@
<key>ShowPGLand</key>
<map>
<key>Comment</key>
- <string>Display results of find land sales that are flagged as PG</string>
+ <string>Display results of find land sales that are flagged as general</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8125,7 +8147,7 @@
<key>ShowMatureLand</key>
<map>
<key>Comment</key>
- <string>Display results of find land sales that are flagged as mature</string>
+ <string>Display results of find land sales that are flagged as moderate</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8151,7 +8173,7 @@
<key>ShowPGSims</key>
<map>
<key>Comment</key>
- <string>Display results of find places or find popular that are in PG sims</string>
+ <string>Display results of find places or find popular that are in general sims</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -8164,7 +8186,7 @@
<key>ShowMatureSims</key>
<map>
<key>Comment</key>
- <string>Display results of find places or find popular that are in mature sims</string>
+ <string>Display results of find places or find popular that are in moderate sims</string>
<key>Persist</key>
<integer>1</integer>
<key>HideFromEditor</key>
@@ -9249,7 +9271,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>3</integer>
+ <integer>4</integer>
</map>
<key>UIMaxComboWidth</key>
<map>