diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-04 17:07:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-04 17:07:27 -0400 |
| commit | 13ca132037e4b8c5b954e0cfe44a9713709bf041 (patch) | |
| tree | 7b90c75957f31f5a149a39b0758ca51545f5a4b3 /indra/newview/llfloatermodelpreview.h | |
| parent | e2eafb565f95e818b842e4bad94d323f0b4da86b (diff) | |
| parent | 503d394fb57c9043114dfe28ef2836f799142747 (diff) | |
merge changes for DRTVWR-157
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; |