diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 10:29:03 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 10:29:03 +0100 |
| commit | f464c663c6a2dfb602bc75ce329313c3539c75d6 (patch) | |
| tree | f031169999bdba72e442faea7a6179fe58efed8d /indra/newview/app_settings | |
| parent | c34bb6f62b0ce623074378173fa9693d938eeb89 (diff) | |
| parent | ea64706e796e90d0cd775c2113c949c2b56c898c (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c9b5631d54..6b9d30423d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10972,7 +10972,27 @@ <key>Value</key> <integer>0</integer> </map> - + <key>max_texture_dimension_X</key> + <map> + <key>Comment</key> + <string>Maximum texture width for user uploaded textures</string> + <key>Persist</key> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>2048</integer> + </map> + <key>max_texture_dimension_Y</key> + <map> + <key>Comment</key> + <string>Maximum texture height for user uploaded textures</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>2048</integer> + </map> <!-- End of back compatibility settings --> </map> </llsd> |