diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:09:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-30 14:09:35 -0400 |
| commit | dd0c04b8648a2cf36a94fa678fad0f55d631d0fc (patch) | |
| tree | 407a599c94044a7add03d8c6662e0209b9ebff62 /indra/newview/llfloatermodelpreview.h | |
| parent | dbac37dcb50bf44255c2b622d418bb4339f1afca (diff) | |
| parent | dd5d7fadca40b43a597b1af14d94273286498ab8 (diff) | |
merge changes for storm-1860
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 64324854a5..c522e6f734 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -30,12 +30,12 @@ #include "llfloaternamedesc.h" #include "lldynamictexture.h" -#include "llfloatermodelwizard.h" #include "llquaternion.h" #include "llmeshrepository.h" #include "llmodel.h" #include "llthread.h" #include "llviewermenufile.h" +#include "llfloatermodeluploadbase.h" class LLComboBox; class LLJoint; @@ -390,9 +390,7 @@ private: protected: friend class LLModelLoader; friend class LLFloaterModelPreview; - friend class LLFloaterModelWizard; friend class LLFloaterModelPreview::DecompRequest; - friend class LLFloaterModelWizard::DecompRequest; friend class LLPhysicsDecomp; LLFloater* mFMP; |