From e8b71e0585ab126f9e77da93d6830a1a73a7aa92 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 18 Jul 2011 18:57:40 -0700
Subject: Changed mesh param type to not conflict with one in-use on server

---
 indra/llprimitive/llprimitive.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h
index 8903d8e049..998016f8f6 100644
--- a/indra/llprimitive/llprimitive.h
+++ b/indra/llprimitive/llprimitive.h
@@ -103,7 +103,8 @@ public:
 		PARAMS_LIGHT    = 0x20,
 		PARAMS_SCULPT   = 0x30,
 		PARAMS_LIGHT_IMAGE = 0x40,
-		PARAMS_MESH     = 0x50,
+		PARAMS_RESERVED = 0x50, // Used on server-side
+		PARAMS_MESH     = 0x60,
 	};
 	
 public:
-- 
cgit v1.2.3