summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-10 11:38:41 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-10 11:38:41 +0100
commit9370ffac47665c309c28fb075b26d8da43192e23 (patch)
tree2d74aeee65b3251991545a341f7fd55538f0fa51 /indra/newview/app_settings/settings.xml
parent5f53ba9af70fac74d7f80393604a9f7c723be625 (diff)
parenta61c8d2272ee709595655024d57a41bfa1ed5354 (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b0211dd85b..d4aebe6cb1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11428,5 +11428,16 @@
<key>Value</key>
<integer>180</integer>
</map>
+ <key>HeightUnits</key>
+ <map>
+ <key>Comment</key>
+ <string>Determines which metric units are used: 1(TRUE) for meter and 0(FALSE) for foot.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
</map>
</llsd>