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/llmeshrepository.h | |
| parent | 27fb647fd1f1ad3280a0c848e2fcb3963a9e40ca (diff) | |
| parent | aba4f7ddc89c9d28bdd4b02735134101f40634ed (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
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 { |