diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-06-20 14:04:18 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-06-20 14:04:18 -0600 |
| commit | f38a42f8cf8434d003e11198b232187f3f98c123 (patch) | |
| tree | bd5eddd34c97ce5550501056764c3ca0101b1107 /indra/newview/app_settings/settings.xml | |
| parent | 27fb647fd1f1ad3280a0c848e2fcb3963a9e40ca (diff) | |
| parent | aba4f7ddc89c9d28bdd4b02735134101f40634ed (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -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> |