18 files changed, 109 insertions, 2 deletions
diff --git a/linden/indra/llprimitive/legacy_object_types.h b/linden/indra/llprimitive/legacy_object_types.h
index 9cdc632..09fd72a 100644
--- a/linden/indra/llprimitive/legacy_object_types.h
+++ b/linden/indra/llprimitive/legacy_object_types.h
@@ -2,6 +2,8 @@
 * @file legacy_object_types.h
 * @brief Byte codes for basic object and primitive types
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LEGACY_OBJECT_TYPES_H
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp
index d7ac57a..9970a03 100644
--- a/linden/indra/llprimitive/llmaterialtable.cpp
+++ b/linden/indra/llprimitive/llmaterialtable.cpp
@@ -2,6 +2,8 @@
 * @file llmaterialtable.cpp
 * @brief Table of material names and IDs for viewer
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llprimitive/llmaterialtable.h b/linden/indra/llprimitive/llmaterialtable.h
index d9596e1..e786a86 100644
--- a/linden/indra/llprimitive/llmaterialtable.h
+++ b/linden/indra/llprimitive/llmaterialtable.h
@@ -2,6 +2,8 @@
 * @file llmaterialtable.h
 * @brief Table of material information for the viewer UI
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLMATERIALTABLE_H
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index 1dfc570..b418793 100644
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -2,6 +2,8 @@
 * @file llprimitive.cpp
 * @brief LLPrimitive base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
@@ -860,6 +863,7 @@ void LLPrimitive::copyTEs(const LLPrimitive *primitivep)
                setTERotation(i, tep->getRotation());
                setTEBumpShinyFullbright(i, tep->getBumpShinyFullbright());
                setTEMediaTexGen(i, tep->getMediaTexGen());
+                setTEGlow(i, tep->getGlow());
        }
 }
@@ -1657,6 +1661,52 @@ void LLPrimitive::setTextureList(LLTextureEntry *listp)
 //============================================================================
+// Moved from llselectmgr.cpp
+// BUG: Only works for boxes.
+// Face numbering for flex boxes as of 1.14.2
+// static
+bool LLPrimitive::getTESTAxes(const U8 face, U32* s_axis, U32* t_axis)
+{
+        if (face == 0)
+        {
+                *s_axis = VX; *t_axis = VY;
+                return true;
+        }
+        else if (face == 1)
+        {
+                *s_axis = VX; *t_axis = VZ;
+                return true;
+        }
+        else if (face == 2)
+        {
+                *s_axis = VY; *t_axis = VZ;
+                return true;
+        }
+        else if (face == 3)
+        {
+                *s_axis = VX; *t_axis = VZ;
+                return true;
+        }
+        else if (face == 4)
+        {
+                *s_axis = VY; *t_axis = VZ;
+                return true;
+        }
+        else if (face == 5)
+        {
+                *s_axis = VX; *t_axis = VY;
+                return true;
+        }
+        else
+        {
+                // unknown face
+                return false;
+        }
+}
+//============================================================================
 //static 
 BOOL LLNetworkData::isValid(U16 param_type, U32 size)
 {
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 @@
 * @file llprimitive.h
 * @brief LLPrimitive base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLPRIMITIVE_H
@@ -359,7 +362,8 @@ public:
        static const char *pCodeToString(const LLPCode pcode);
        static LLPCode legacyToPCode(const U8 legacy);
        static U8 pCodeToLegacy(const LLPCode pcode);
+        static bool getTESTAxes(const U8 face, U32* s_axis, U32* t_axis);
+        
        inline static BOOL isPrimitive(const LLPCode pcode);
        inline static BOOL isApp(const LLPCode pcode);
diff --git a/linden/indra/llprimitive/lltextureanim.cpp b/linden/indra/llprimitive/lltextureanim.cpp
index e373a29..b15e5a8 100644
--- a/linden/indra/llprimitive/lltextureanim.cpp
+++ b/linden/indra/llprimitive/lltextureanim.cpp
@@ -2,6 +2,8 @@
 * @file lltextureanim.cpp
 * @brief LLTextureAnim base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llprimitive/lltextureanim.h b/linden/indra/llprimitive/lltextureanim.h
index 502cf54..32e66da 100644
--- a/linden/indra/llprimitive/lltextureanim.h
+++ b/linden/indra/llprimitive/lltextureanim.h
@@ -2,6 +2,8 @@
 * @file lltextureanim.h
 * @brief LLTextureAnim base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLTEXTUREANIM_H
diff --git a/linden/indra/llprimitive/lltextureentry.cpp b/linden/indra/llprimitive/lltextureentry.cpp
index 73ecd96..e6eee9b 100644
--- a/linden/indra/llprimitive/lltextureentry.cpp
+++ b/linden/indra/llprimitive/lltextureentry.cpp
@@ -2,6 +2,8 @@
 * @file lltextureentry.cpp
 * @brief LLTextureEntry base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llprimitive/lltextureentry.h b/linden/indra/llprimitive/lltextureentry.h
index c1f355b..960d97b 100644
--- a/linden/indra/llprimitive/lltextureentry.h
+++ b/linden/indra/llprimitive/lltextureentry.h
@@ -2,6 +2,8 @@
 * @file lltextureentry.h
 * @brief LLTextureEntry base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLTEXTUREENTRY_H
@@ -144,6 +147,10 @@ protected:
        U8                                      mBump;                                  // Bump map, shiny, and fullbright
        U8                                      mMediaFlags;                    // replace with web page, movie, etc.
        F32                 mGlow;
+        // NOTE: when adding new data to this class, in addition to adding it to the serializers asLLSD/fromLLSD and the
+        // message packers (e.g. LLPrimitive::packTEMessage) you must also implement its copy in LLPrimitive::copyTEs()
        
 };
diff --git a/linden/indra/llprimitive/lltree_common.h b/linden/indra/llprimitive/lltree_common.h
index f9594e2..302e938 100644
--- a/linden/indra/llprimitive/lltree_common.h
+++ b/linden/indra/llprimitive/lltree_common.h
@@ -2,6 +2,8 @@
 * @file lltree_common.h
 * @brief LLTree_gene_0 base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 //      Common data for trees shared between simulator and viewer
diff --git a/linden/indra/llprimitive/lltreeparams.cpp b/linden/indra/llprimitive/lltreeparams.cpp
index fde21f0..ba038ff 100644
--- a/linden/indra/llprimitive/lltreeparams.cpp
+++ b/linden/indra/llprimitive/lltreeparams.cpp
@@ -2,6 +2,8 @@
 * @file lltreeparams.cpp
 * @brief implementation of the LLTreeParams class.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 //////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llprimitive/lltreeparams.h b/linden/indra/llprimitive/lltreeparams.h
index 2754eb4..c4bb1ea 100644
--- a/linden/indra/llprimitive/lltreeparams.h
+++ b/linden/indra/llprimitive/lltreeparams.h
@@ -2,6 +2,8 @@
 * @file lltreeparams.h
 * @brief Implementation of the LLTreeParams class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLTREEPARAMS_H
diff --git a/linden/indra/llprimitive/llvolumemessage.cpp b/linden/indra/llprimitive/llvolumemessage.cpp
index 650e0cd..c7efc86 100644
--- a/linden/indra/llprimitive/llvolumemessage.cpp
+++ b/linden/indra/llprimitive/llvolumemessage.cpp
@@ -2,6 +2,8 @@
 * @file llvolumemessage.cpp
 * @brief LLVolumeMessage base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llprimitive/llvolumemessage.h b/linden/indra/llprimitive/llvolumemessage.h
index e626a04..7e7da3d 100644
--- a/linden/indra/llprimitive/llvolumemessage.h
+++ b/linden/indra/llprimitive/llvolumemessage.h
@@ -2,6 +2,8 @@
 * @file llvolumemessage.h
 * @brief LLVolumeMessage base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLVOLUMEMESSAGE_H
diff --git a/linden/indra/llprimitive/llvolumexml.cpp b/linden/indra/llprimitive/llvolumexml.cpp
index 370f152..c9af11c 100644
--- a/linden/indra/llprimitive/llvolumexml.cpp
+++ b/linden/indra/llprimitive/llvolumexml.cpp
@@ -2,6 +2,8 @@
 * @file llvolumexml.cpp
 * @brief LLVolumeXml base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llprimitive/llvolumexml.h b/linden/indra/llprimitive/llvolumexml.h
index 0a3d1c5..8bec5f7 100644
--- a/linden/indra/llprimitive/llvolumexml.h
+++ b/linden/indra/llprimitive/llvolumexml.h
@@ -2,6 +2,8 @@
 * @file llvolumexml.h
 * @brief LLVolumeXml base class
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_LLVOLUMEXML_H
diff --git a/linden/indra/llprimitive/material_codes.h b/linden/indra/llprimitive/material_codes.h
index 01a5573..8e77a43 100644
--- a/linden/indra/llprimitive/material_codes.h
+++ b/linden/indra/llprimitive/material_codes.h
@@ -2,6 +2,8 @@
 * @file material_codes.h
 * @brief Material_codes definitions
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_MATERIAL_CODES_H
diff --git a/linden/indra/llprimitive/object_flags.h b/linden/indra/llprimitive/object_flags.h
index e7bf023..cc37d06 100644
--- a/linden/indra/llprimitive/object_flags.h
+++ b/linden/indra/llprimitive/object_flags.h
@@ -2,6 +2,8 @@
 * @file object_flags.h
 * @brief Flags for object creation and transmission
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #ifndef LL_OBJECT_FLAGS_H
@@ -46,7 +49,8 @@ const U32	FLAGS_INVENTORY_EMPTY		= 0x00000800;
 const U32       FLAGS_JOINT_HINGE                       = 0x00001000;
 const U32       FLAGS_JOINT_P2P                         = 0x00002000;
 const U32       FLAGS_JOINT_LP2P                        = 0x00004000;
-//const U32     FLAGS_JOINT_WHEEL                       = 0x00008000;
+// const U32    FLAGS_JOINT_WHEEL               = 0x00008000;
+const U32       FLAGS_INCLUDE_IN_SEARCH         = 0x00008000;
 const U32       FLAGS_ALLOW_INVENTORY_DROP      = 0x00010000;
 const U32       FLAGS_OBJECT_TRANSFER           = 0x00020000;