diff options
| author | Jacek Antonelli | 2009-11-28 00:04:25 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-28 00:04:25 -0600 |
| commit | 4bbee8774d743fb4787fc2435a20d89539011fa4 (patch) | |
| tree | 205bc840bc52a4a83526e7441ed3efae3937f5b0 /linden/indra/newview/app_settings | |
| parent | 'FALSE' is supposed to be 'OFF' in develop.py. (diff) | |
| parent | Second Life viewer sources 1.23.5 (diff) | |
| download | meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.zip meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.tar.gz meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.tar.bz2 meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.tar.xz | |
Merged SL 1.23.5 into Imprudence.
Conflicts:
linden/indra/cmake/CopyWinLibs.cmake
linden/indra/lib/python/indra/util/llversion.py
linden/indra/llcommon/llversionviewer.h
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/Info-Imprudence.plist
linden/indra/newview/llassetuploadresponders.cpp
linden/indra/newview/llpreview.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/indra/newview/app_settings')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 2e08087..12d052c 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -7895,7 +7895,7 @@ | |||
| 7895 | <key>Type</key> | 7895 | <key>Type</key> |
| 7896 | <string>S32</string> | 7896 | <string>S32</string> |
| 7897 | <key>Value</key> | 7897 | <key>Value</key> |
| 7898 | <integer>4096</integer> | 7898 | <integer>8192</integer> |
| 7899 | </map> | 7899 | </map> |
| 7900 | <key>RenderMaxVBOSize</key> | 7900 | <key>RenderMaxVBOSize</key> |
| 7901 | <map> | 7901 | <map> |