livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge from mesh-development

meow-7.2.2
Loren Shih 2011-01-04 17:24:06 -05:00
parent 5fe826945c 8eda31456a
commit 2729360a2d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatermodelpreview.h
View File

@ -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;