diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
| commit | 5b9da4e8d91acd075dfaf33fb489c480c25e9ade (patch) | |
| tree | f296e32b384b341d9c626a4305cd7cd8924c9986 /indra/newview/app_settings | |
| parent | c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 (diff) | |
| parent | 144b8349b3f0773ac575e178a0e3109d963be9a8 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 480c0ffd03..75ace99806 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10712,7 +10712,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>WaterEditPresets</key> <map> @@ -11094,7 +11094,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> |