diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-22 13:04:53 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-22 13:04:53 -0700 |
| commit | 569f3f4b06fc2f5a0fa658a49d519428983403f9 (patch) | |
| tree | 3fdafee487d0b922793ff864970ce73f223cd861 /indra/newview/llfloaterimportcollada.h | |
| parent | 05c2f451dcbb7fdfb6d45d8b65ec71ba6b799af4 (diff) | |
| parent | 6d8e9cd8bde57bd033beeb9610f7094c19655ed1 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterimportcollada.h')
| -rw-r--r-- | indra/newview/llfloaterimportcollada.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfloaterimportcollada.h b/indra/newview/llfloaterimportcollada.h index 818b19e403..4eb263901b 100644 --- a/indra/newview/llfloaterimportcollada.h +++ b/indra/newview/llfloaterimportcollada.h @@ -34,9 +34,6 @@ #define LL_LLFLOATERIMPORTCOLLADA_H #include "llfloater.h" -#include "llvolume.h" //for LL_MESH_ENABLED - -#if LL_MESH_ENABLED class LLFloaterImportCollada : public LLFloater { @@ -138,6 +135,4 @@ private: LLMatrix4 mSceneTransformation; }; -#endif - #endif // LL_LLFLOATERIMPORTCOLLADA_H |