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.cpp | |
| parent | 05c2f451dcbb7fdfb6d45d8b65ec71ba6b799af4 (diff) | |
| parent | 6d8e9cd8bde57bd033beeb9610f7094c19655ed1 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterimportcollada.cpp')
| -rw-r--r-- | indra/newview/llfloaterimportcollada.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimportcollada.cpp b/indra/newview/llfloaterimportcollada.cpp index 476c02cd46..000347f68c 100644 --- a/indra/newview/llfloaterimportcollada.cpp +++ b/indra/newview/llfloaterimportcollada.cpp @@ -74,8 +74,6 @@ // floater // -#if LL_MESH_ENABLED - LLFloaterImportCollada::LLFloaterImportCollada(const LLSD& key) : LLFloater(key) { @@ -1113,4 +1111,3 @@ void LLImportCollada::onCommitCancel(LLUICtrl*, void*) getInstance()->endImport(); } -#endif |