summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-09-22 03:04:21 -0500
committerDave Parks <davep@lindenlab.com>2010-09-22 03:04:21 -0500
commitcf09d6c58a741263cddcf338c2f79836873475b1 (patch)
tree38c5adaf911371f72176485d0ddf13f029cee431 /indra/newview/llfloatermodelpreview.cpp
parent7d625ef060c9916268c479ab817b24ac1d23199f (diff)
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 3ef892f739..088c9e6546 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -98,9 +98,6 @@
#include "glod/glod.h"
-
-#if LL_MESH_ENABLED
-
//static
S32 LLFloaterModelPreview::sUploadAmount = 10;
LLFloaterModelPreview* LLFloaterModelPreview::sInstance = NULL;
@@ -3437,5 +3434,3 @@ void LLModelPreview::textureLoadedCallback( BOOL success, LLViewerFetchedTexture
preview->refresh();
}
-#endif
-