summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorVladimir Pchelko <pchelko@productengine.com>2010-06-09 13:46:10 +0300
committerVladimir Pchelko <pchelko@productengine.com>2010-06-09 13:46:10 +0300
commit0d5da282de9c0891b0af654b2f9b6f0e66204732 (patch)
tree3e1548115a2c681480d91bcc078e1ba1c1ae187a /indra/newview/app_settings
parentd7eefeafeaea5e515c805c88058154a1e6a5d68e (diff)
EXT-7640 FIXED Added new option to viewer avatar height that allows users to see their height in either feet or meters
Feature details: Added new property HeightUnits. Implemented logic that build TextBox label correctly according to document https://docs.google.com/a/productengine.com/Doc?docid=0AXxJWUubGIsoZGhqZDcya3JfMWdybXNwdGd0&hl=en -> 'Mockup - Edit Shape' Reviewed by Vadim Savchuk, Neal Orman, Mike Antipov at https://codereview.productengine.com/secondlife/r/531/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
-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 52e987dac9..0af77b6a84 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>