aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llprimitive/llprimitive.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/llprimitive/llprimitive.h
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/llprimitive/llprimitive.h')
-rw-r--r--linden/indra/llprimitive/llprimitive.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index 1a568d1..53b17bc 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -2,6 +2,8 @@
2 * @file llprimitive.h 2 * @file llprimitive.h
3 * @brief LLPrimitive base class 3 * @brief LLPrimitive base class
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#ifndef LL_LLPRIMITIVE_H 32#ifndef LL_LLPRIMITIVE_H
@@ -359,7 +362,8 @@ public:
359 static const char *pCodeToString(const LLPCode pcode); 362 static const char *pCodeToString(const LLPCode pcode);
360 static LLPCode legacyToPCode(const U8 legacy); 363 static LLPCode legacyToPCode(const U8 legacy);
361 static U8 pCodeToLegacy(const LLPCode pcode); 364 static U8 pCodeToLegacy(const LLPCode pcode);
362 365 static bool getTESTAxes(const U8 face, U32* s_axis, U32* t_axis);
366
363 inline static BOOL isPrimitive(const LLPCode pcode); 367 inline static BOOL isPrimitive(const LLPCode pcode);
364 inline static BOOL isApp(const LLPCode pcode); 368 inline static BOOL isApp(const LLPCode pcode);
365 369