Merged webkit_plugins into weekly. Huzzah! The weekly branch now has browser/media plugin support

1 files changed, 44 insertions, 14 deletions

diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index efabb82..e146fbe 100644..100755
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2001-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -37,9 +37,11 @@
 #include "v3math.h"
 #include "xform.h"
 #include "message.h"
-#include "llmemory.h"
+#include "llmemory.h"   // not in SG2.0
+//#include "llpointer.h"// instead in SG2.0 
 #include "llvolume.h"
 #include "lltextureentry.h"
+#include "llprimtexturelist.h"
 
 // Moved to stdtypes.h --JC
 // typedef U8 LLPCode;
@@ -105,7 +107,8 @@ public:
         {
                 PARAMS_FLEXIBLE = 0x10,
                 PARAMS_LIGHT    = 0x20,
-                PARAMS_SCULPT   = 0x30
+                PARAMS_SCULPT   = 0x30,
+                PARAMS_LIGHT_IMAGE = 0x40,
         };
         
 public:
@@ -260,11 +263,33 @@ public:
         bool fromLLSD(LLSD& sd);
 
         void setSculptTexture(const LLUUID& id) { mSculptTexture = id; }
-        LLUUID getSculptTexture()               { return mSculptTexture; }
+        LLUUID getSculptTexture() const         { return mSculptTexture; }
         void setSculptType(U8 type)             { mSculptType = type; }
-        U8 getSculptType()                      { return mSculptType; }
+        U8 getSculptType() const                { return mSculptType; }
 };
 
+class LLLightImageParams : public LLNetworkData
+{
+protected:
+        LLUUID mLightTexture;
+        LLVector3 mParams;
+        
+public:
+        LLLightImageParams();
+        /*virtual*/ BOOL pack(LLDataPacker &dp) const;
+        /*virtual*/ BOOL unpack(LLDataPacker &dp);
+        /*virtual*/ bool operator==(const LLNetworkData& data) const;
+        /*virtual*/ void copy(const LLNetworkData& data);
+        LLSD asLLSD() const;
+        operator LLSD() const { return asLLSD(); }
+        bool fromLLSD(LLSD& sd);
+
+        void setLightTexture(const LLUUID& id) { mLightTexture = id; }
+        LLUUID getLightTexture() const         { return mLightTexture; }
+        void setParams(const LLVector3& params) { mParams = params; }
+        LLVector3 getParams() const                        { return mParams; }
+        
+};
 
 
 class LLPrimitive : public LLXform
@@ -294,6 +319,8 @@ public:
         LLPrimitive();
         virtual ~LLPrimitive();
 
+        void clearTextureList();
+
         static LLPrimitive *createPrimitive(LLPCode p_code);
         void init_primitive(LLPCode p_code);
 
@@ -304,11 +331,11 @@ public:
 
         // Modify texture entry properties
         inline BOOL validTE(const U8 te_num) const;
-        const LLTextureEntry *getTE(const U8 te_num) const;
+        LLTextureEntry* getTE(const U8 te_num) const;
 
         virtual void setNumTEs(const U8 num_tes);
         virtual void setAllTETextures(const LLUUID &tex_id);
-        virtual void setTE(const U8 index, const LLTextureEntry &te);
+        virtual void setTE(const U8 index, const LLTextureEntry& te);
         virtual S32 setTEColor(const U8 te, const LLColor4 &color);
         virtual S32 setTEColor(const U8 te, const LLColor3 &color);
         virtual S32 setTEAlpha(const U8 te, const F32 alpha);
@@ -331,10 +358,6 @@ public:
         virtual S32 setTEGlow(const U8 te, const F32 glow);
         virtual BOOL setMaterial(const U8 material); // returns TRUE if material changed
 
-        void setTEArrays(const U8 size,
-                                          const LLUUID* image_ids,
-                                          const F32* scale_s,
-                                          const F32* scale_t);
         void copyTEs(const LLPrimitive *primitive);
         S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const;
         S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type);
@@ -382,14 +405,21 @@ public:
         const LLVector3&        getAngularVelocity() const      { return mAngularVelocity; }
         const LLVector3&        getVelocity() const                     { return mVelocity; }
         const LLVector3&        getAcceleration() const         { return mAcceleration; }
-        U8                                      getNumTEs() const                       { return mNumTEs; }
+        U8                                      getNumTEs() const                       { return mTextureList.size(); }
+        U8                                      getExpectedNumTEs() const;
 
         U8                                      getMaterial() const                     { return mMaterial; }
         
         void                            setVolumeType(const U8 code);
         U8                                      getVolumeType();
 
-        void setTextureList(LLTextureEntry *listp);
+        // clears existing textures
+        // copies the contents of other_list into mEntryList
+        void copyTextureList(const LLPrimTextureList& other_list);
+
+        // clears existing textures
+        // takes the contents of other_list and clears other_list
+        void takeTextureList(LLPrimTextureList& other_list);
 
         inline BOOL     isAvatar() const;
         inline BOOL     isSittingAvatar() const;
@@ -414,7 +444,7 @@ protected:
         LLVector3                       mAcceleration;          // are we under constant acceleration?
         LLVector3                       mAngularVelocity;       // angular velocity
         LLPointer<LLVolume> mVolumep;
-        LLTextureEntry          *mTextureList;          // list of texture GUIDs, scales, offsets
+        LLPrimTextureList       mTextureList;           // list of texture GUIDs, scales, offsets
         U8                                      mMaterial;                      // Material code
         U8                                      mNumTEs;                        // # of faces on the primitve   
         U32                             mMiscFlags;                     // home for misc bools