diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-12 12:53:44 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-12 12:53:44 +0200 |
| commit | 3c3271761b918a19f7a10d80da9dd23e5127de2c (patch) | |
| tree | d4205dd5827c215b2cb615bc364b01b1b7eada0d /indra/newview/app_settings | |
| parent | 13148203a440cf1bb36c928a8677bfeb7c0e32d6 (diff) | |
| parent | 3b2697cb93e6b8a1f1281aeab0e960bc6704d8c4 (diff) | |
Merge with default branch, resolved conflict in llpanelavatar.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7d98a4b6ce..382793a497 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3257,17 +3257,6 @@ <key>Value</key> <real>0.75</real> </map> - <key>FolderIndentation</key> - <map> - <key>Comment</key> - <string>Number of pixels to indent subfolders in inventory</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>8</integer> - </map> <key>FolderLoadingMessageWaitTime</key> <map> <key>Comment</key> |