diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-20 14:01:32 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-20 14:01:32 -0600 |
| commit | aba4f7ddc89c9d28bdd4b02735134101f40634ed (patch) | |
| tree | 4182980e77f5e12e229ca3f166f8acbefec41e77 /indra/newview/app_settings | |
| parent | f0369f3d2ceb39dcfb4eee06a12c4a8393cb026f (diff) | |
fix for SH-1870: can not upload book_collection_1.dae when include textures
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 76fecdf05e..52064c96f2 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5611,6 +5611,17 @@ <key>Value</key> <real>0</real> </map> + <key>MeshUploadTimeOut</key> + <map> + <key>Comment</key> + <string>Maximum time in seconds for llcurl to execute a mesh uoloading request</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <real>600</real> + </map> <key>MigrateCacheDirectory</key> <map> <key>Comment</key> |