diff options
| author | Armin Weatherwax | 2010-02-22 13:47:15 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-03-04 20:58:10 -0600 |
| commit | 3609359ca157d122a15480f19fea18de0015cb3c (patch) | |
| tree | 8de3fca09dd17db5598f972344495ad695c508af /linden/indra/newview/app_settings | |
| parent | Linux64: for DBUS-Debug build- track where it's crashing (if still). (diff) | |
| download | meta-impy-3609359ca157d122a15480f19fea18de0015cb3c.zip meta-impy-3609359ca157d122a15480f19fea18de0015cb3c.tar.gz meta-impy-3609359ca157d122a15480f19fea18de0015cb3c.tar.bz2 meta-impy-3609359ca157d122a15480f19fea18de0015cb3c.tar.xz | |
Ported temporary texture uploads from Emerald.
Diffstat (limited to 'linden/indra/newview/app_settings')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 5687eb7..93dc2fb 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -3415,6 +3415,21 @@ | |||
| 3415 | <real>1.0</real> | 3415 | <real>1.0</real> |
| 3416 | </array> | 3416 | </array> |
| 3417 | </map> | 3417 | </map> |
| 3418 | |||
| 3419 | |||
| 3420 | <key>EmeraldTemporaryUpload</key> | ||
| 3421 | <map> | ||
| 3422 | <key>Comment</key> | ||
| 3423 | <string>Whether or not a texture upload is temp</string> | ||
| 3424 | <key>Persist</key> | ||
| 3425 | <integer>0</integer> | ||
| 3426 | <key>Type</key> | ||
| 3427 | <string>Boolean</string> | ||
| 3428 | <key>Value</key> | ||
| 3429 | <integer>0</integer> | ||
| 3430 | </map> | ||
| 3431 | |||
| 3432 | |||
| 3418 | <key>EnableRippleWater</key> | 3433 | <key>EnableRippleWater</key> |
| 3419 | <map> | 3434 | <map> |
| 3420 | <key>Comment</key> | 3435 | <key>Comment</key> |