diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-12-22 01:05:35 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-12-22 01:05:35 -0600 |
| commit | e1b1db9575945fa8436b4ebabf55242635b61f38 (patch) | |
| tree | 998eed633f51cb2ea8142f745d044fe6be900764 /indra/newview/llfloatermodelpreview.h | |
| parent | e9d21ba941a52665d7ad2ee3483c6ac7b7ec6486 (diff) | |
SH-636 Update physics tab to new spec, move "completed" physics decomp callbacks to main thread, add object model to decomposition tool, make imported model scales non-uniform.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index e233f3672a..f7873cddbb 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -199,6 +199,8 @@ protected: void initDecompControls(); + void setStatusMessage(const std::string& msg); + LLModelPreview* mModelPreview; LLPhysicsDecomp::decomp_params mDecompParams; @@ -209,8 +211,9 @@ protected: U32 mGLName; static S32 sUploadAmount; - LLPointer<DecompRequest> mCurRequest; - + std::set<LLPointer<DecompRequest> > mCurRequest; + std::string mStatusMessage; + std::map<std::string, bool> mViewOption; //use "disabled" as false by default @@ -218,7 +221,7 @@ protected: LLMenuButton* mViewOptionMenuButton; LLToggleableMenu* mViewOptionMenu; - + LLMutex* mStatusLock; }; class LLMeshFilePicker : public LLFilePickerThread |