diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-02 11:53:42 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-02 11:53:42 -0400 |
| commit | 86d33e21a73e1f9db5b88b7169e32070c488bb48 (patch) | |
| tree | 6c09925f34719c43c543dc23c8095af7a2c392d9 /indra/newview/llfloatermodelpreview.h | |
| parent | 22b1223ea7d68b27304cdd713f8e8b491b654060 (diff) | |
| parent | b7555a3309bda8e9689627901051aa90fcb7be34 (diff) | |
merge
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 981f9b0f72..ab319c30d5 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; @@ -389,9 +389,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; |