diff options
author | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
commit | f9081220accfe5c197f1c567af8806bde236f946 (patch) | |
tree | e711a74a34aa309222d28f694f02345dde305c4d /indra/newview/app_settings | |
parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 994e546bd0..075aee46c7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7722,10 +7722,10 @@ <key>Value</key> <integer>0</integer> </map> - <key>ShowCoordinatesOption</key> + <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> @@ -7733,6 +7733,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> |