summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-24 08:35:47 -0800
committerJames Cook <james@lindenlab.com>2009-11-24 08:35:47 -0800
commit0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (patch)
treed4d83f4347fe6a56931a97a3eedabb97bdcfefff /indra/newview/app_settings
parent156ced177d22623f0b5291f043636b7d32f69470 (diff)
parent6634d3c1ccbe13d3c0cdd17b60628eabe633ea7d (diff)
Automated merge with ssh://hg.lindenlab.com/james/gooey/
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 21ccf2ac91..85a465c073 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7712,7 +7712,7 @@
<key>NavBarShowCoordinates</key>
<map>
<key>Comment</key>
- <string>Show Coordinates in Location Input Field</string>
+ <string>Show coordinates in navigation bar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7720,6 +7720,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>NavBarShowParcelProperties</key>
+ <map>
+ <key>Comment</key>
+ <string>Show parcel property icons in navigation bar</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>ShowCrosshairs</key>
<map>
<key>Comment</key>