summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
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/llinventorybridge.h
parent7d625ef060c9916268c479ab817b24ac1d23199f (diff)
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rwxr-xr-xindra/newview/llinventorybridge.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 4c6c3ab82f..e1bfff7e0c 100755
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -40,7 +40,6 @@
#include "llinventoryobserver.h"
#include "llviewercontrol.h"
#include "llwearable.h"
-#include "llvolume.h" //for LL_MESH_ENABLED
class LLInventoryPanel;
class LLInventoryModel;
@@ -530,7 +529,6 @@ protected:
};
-#if LL_MESH_ENABLED
class LLMeshBridge : public LLItemBridge
{
friend class LLInvFVBridge;
@@ -546,8 +544,6 @@ protected:
const LLUUID& uuid) :
LLItemBridge(inventory, root, uuid) {}
};
-#endif
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~