diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
commit | ca3cea390ca44e6e6c390b390e0ebdfafd2afa9e (patch) | |
tree | 005b934f87b6c5adc0a6f84ef6f12c67d606ce37 /indra/llprimitive/llprimitive.h | |
parent | 1d9fe077a64d36272b32ae0fb1888d2b25aa1d43 (diff) | |
parent | 5451af6cca43f296e1b5654ab3e611928929c1c9 (diff) |
merge changes for storm-1537 : releasable mesh branch
Diffstat (limited to 'indra/llprimitive/llprimitive.h')
-rwxr-xr-x[-rw-r--r--] | indra/llprimitive/llprimitive.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h index 76faa1b8c5..998016f8f6 100644..100755 --- a/indra/llprimitive/llprimitive.h +++ b/indra/llprimitive/llprimitive.h @@ -103,6 +103,8 @@ public: PARAMS_LIGHT = 0x20, PARAMS_SCULPT = 0x30, PARAMS_LIGHT_IMAGE = 0x40, + PARAMS_RESERVED = 0x50, // Used on server-side + PARAMS_MESH = 0x60, }; public: |