diff options
author | Richard Linden <none@none> | 2013-11-06 09:42:46 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-11-06 09:42:46 -0800 |
commit | d9d46d908c0573dbcd45ec2a1bea56966823343b (patch) | |
tree | 12c095a60fdbb9d7317f544ab3c72f55e9114f93 /indra/newview/app_settings/settings.xml | |
parent | 2cb781705e56e31e11c4c37891b2ac86326aa411 (diff) | |
parent | a10eb7b240675b009430f6718d410399d8045581 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index db7be5abc4..6c1a7ed897 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11981,50 +11981,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>UIAvatariconctrlSymbolHPad</key> - <map> - <key>Comment</key> - <string>UI Avatar Icon Control Symbol Horizontal Pad</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <real>2</real> - </map> - <key>UIAvatariconctrlSymbolVPad</key> - <map> - <key>Comment</key> - <string>UI Avatar Icon Control Symbol Vertical Pad</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <real>2</real> - </map> - <key>UIAvatariconctrlSymbolSize</key> - <map> - <key>Comment</key> - <string>UI Avatar Icon Control Symbol Size</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <real>5</real> - </map> - <key>UIAvatariconctrlSymbolPosition</key> - <map> - <key>Comment</key> - <string>UI Avatar Icon Control Symbol Position (TopLeft|TopRight|BottomLeft|BottomRight)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>BottomRight</string> - </map> <key>UIButtonOrigHPad</key> <map> <key>Comment</key> |