summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-28 22:30:09 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-28 22:30:09 +0000
commit51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (patch)
tree2ed65f1dd0a8404eda670cf1fe2e37769758f74a /indra/newview/app_settings
parentb2b980d6979b10a08b56c10b71c12ae4f9e6ff59 (diff)
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4e64b8662c..4e2f836606 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6866,7 +6866,7 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowCrosshairs</key>
+ <key>ShowCoordinatesOption</key>
<map>
<key>Comment</key>
<string>Show Coordinates in Location Input Field</string>
@@ -6877,7 +6877,7 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowCoordinatesOption</key>
+ <key>ShowCrosshairs</key>
<map>
<key>Comment</key>
<string>Display crosshairs when in mouselook mode</string>