diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-22 03:04:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-22 03:04:21 -0500 |
| commit | cf09d6c58a741263cddcf338c2f79836873475b1 (patch) | |
| tree | 38c5adaf911371f72176485d0ddf13f029cee431 /indra/llmath/llvolume.h | |
| parent | 7d625ef060c9916268c479ab817b24ac1d23199f (diff) | |
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rwxr-xr-x | indra/llmath/llvolume.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 32364bd4b8..b4b59fd402 100755 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -41,8 +41,6 @@ class LLVolumeParams; class LLProfile; class LLPath; -#define LL_MESH_ENABLED 1 - template <class T> class LLOctreeNode; class LLVector4a; @@ -192,15 +190,9 @@ const U8 LL_SCULPT_TYPE_SPHERE = 1; const U8 LL_SCULPT_TYPE_TORUS = 2; const U8 LL_SCULPT_TYPE_PLANE = 3; const U8 LL_SCULPT_TYPE_CYLINDER = 4; -#if LL_MESH_ENABLED const U8 LL_SCULPT_TYPE_MESH = 5; - const U8 LL_SCULPT_TYPE_MASK = LL_SCULPT_TYPE_SPHERE | LL_SCULPT_TYPE_TORUS | LL_SCULPT_TYPE_PLANE | LL_SCULPT_TYPE_CYLINDER | LL_SCULPT_TYPE_MESH; -#else -const U8 LL_SCULPT_TYPE_MASK = LL_SCULPT_TYPE_SPHERE | LL_SCULPT_TYPE_TORUS | LL_SCULPT_TYPE_PLANE | - LL_SCULPT_TYPE_CYLINDER; -#endif const U8 LL_SCULPT_FLAG_INVERT = 64; const U8 LL_SCULPT_FLAG_MIRROR = 128; |