diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-03-25 14:04:52 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-03-25 14:04:52 -0600 |
| commit | 971eac1aa26fecaf6a8bbb7ca568ed400866c197 (patch) | |
| tree | 34851e900cf0339925d27003833cc3fdb51ae1b6 /indra/newview/llmeshrepository.h | |
| parent | d2bb490702921b5ca9fdcd562c67844e2d4802e1 (diff) | |
fix for SH-838: Crash if exit during mesh upload
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index f0c0f308d5..4e349a1270 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -405,11 +405,12 @@ public: S32 mPendingConfirmations; S32 mPendingUploads; S32 mPendingCost; - bool mFinished; LLVector3 mOrigin; + bool mFinished; bool mUploadTextures; bool mUploadSkin; bool mUploadJoints; + BOOL mDiscarded ; LLHost mHost; std::string mUploadObjectAssetCapability; @@ -445,7 +446,8 @@ public: bool finished() { return mFinished; } virtual void run(); void preStart(); - + void discard() ; + BOOL isDiscarded(); }; class LLMeshRepository |