summaryrefslogtreecommitdiff
path: root/indra/llprimitive
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/llprimitive
parent7d625ef060c9916268c479ab817b24ac1d23199f (diff)
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
Diffstat (limited to 'indra/llprimitive')
-rwxr-xr-xindra/llprimitive/llmodel.cpp2
-rwxr-xr-xindra/llprimitive/llmodel.h5
2 files changed, 0 insertions, 7 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index ae17996956..349c844470 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -41,7 +41,6 @@
#include "dom/domMesh.h"
#include "zlib/zlib.h"
-#if LL_MESH_ENABLED
std::string model_names[] =
{
@@ -1710,5 +1709,4 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
}
}
-#endif
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index a91c80d5b7..ea703d7228 100755
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -36,8 +36,6 @@
#include "v4math.h"
#include "m4math.h"
-#if LL_MESH_ENABLED
-
class daeElement;
class domMesh;
@@ -173,7 +171,4 @@ protected:
virtual BOOL createVolumeFacesFromDomMesh(domMesh *mesh);
};
-
-#endif
-
#endif //LL_LLMODEL_H