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/llmeshrepository.h | |
| parent | f0369f3d2ceb39dcfb4eee06a12c4a8393cb026f (diff) | |
fix for SH-1870: can not upload book_collection_1.dae when include textures
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index f237c3a60e..f56734a7de 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -356,6 +356,9 @@ public: class LLMeshUploadThread : public LLThread { +private: + S32 mMeshUploadTimeOut ; //maximum time in seconds to execute an uploading request. + public: class DecompRequest : public LLPhysicsDecomp::Request { |