diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-04 17:24:06 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-04 17:24:06 -0500 |
| commit | 2729360a2d3a2ff045250a90d344782254cf8465 (patch) | |
| tree | 40becc5093838b2ffc45ff691ed049b98432c8e1 | |
| parent | 5fe826945cd4ce22ffacd97894ab5e7f7d22719a (diff) | |
| parent | 8eda31456a0466cfa7674a881ebc69ea2abbf8a1 (diff) | |
Automated merge from mesh-development
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index df1b06aeaf..11c2447da5 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -30,6 +30,7 @@ #include "llfloaternamedesc.h" #include "lldynamictexture.h" +#include "llfloatermodelwizard.h" #include "llquaternion.h" #include "llmeshrepository.h" #include "llmodel.h" @@ -281,6 +282,7 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex friend class LLFloaterModelPreview; friend class LLFloaterModelWizard; friend class LLFloaterModelPreview::DecompRequest; + friend class LLFloaterModelWizard::DecompRequest; friend class LLPhysicsDecomp; LLFloater* mFMP; @@ -301,7 +303,7 @@ class LLModelPreview : public LLViewerDynamicTexture, public LLMutex std::string mLODFile[LLModel::NUM_LODS]; bool mLoading; - std::map<std::string, bool> mViewOption;
+ std::map<std::string, bool> mViewOption; //GLOD object parameters (must rebuild object if these change) F32 mBuildShareTolerance; |