1 files changed, 288 insertions, 26 deletions

diff --git a/linden/indra/llprimitive/lltextureentry.cpp b/linden/indra/llprimitive/lltextureentry.cpp
index 14b4544..11afdc0 100644..100755
--- a/linden/indra/llprimitive/lltextureentry.cpp
+++ b/linden/indra/llprimitive/lltextureentry.cpp
@@ -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
@@ -32,25 +32,52 @@
 
 #include "linden_common.h"
 
+#include "lluuid.h"
+#include "llmediaentry.h"
 #include "lltextureentry.h"
-#include "llsdutil.h"
+#include "llsdutil.h"//_math.h"
+#include "v4color.h"
 
 const U8 DEFAULT_BUMP_CODE = 0;  // no bump or shininess
 
 const LLTextureEntry LLTextureEntry::null;
 
+// Some LLSD keys.  Do not change these!
+#define OBJECT_ID_KEY_STR "object_id"
+#define TEXTURE_INDEX_KEY_STR "texture_index"
+#define OBJECT_MEDIA_VERSION_KEY_STR "object_media_version"
+#define OBJECT_MEDIA_DATA_KEY_STR "object_media_data"
+#define TEXTURE_MEDIA_DATA_KEY_STR "media_data"
+
+/*static*/ const char* LLTextureEntry::OBJECT_ID_KEY = OBJECT_ID_KEY_STR;
+/*static*/ const char* LLTextureEntry::OBJECT_MEDIA_DATA_KEY = OBJECT_MEDIA_DATA_KEY_STR;
+/*static*/ const char* LLTextureEntry::MEDIA_VERSION_KEY = OBJECT_MEDIA_VERSION_KEY_STR;
+/*static*/ const char* LLTextureEntry::TEXTURE_INDEX_KEY = TEXTURE_INDEX_KEY_STR;
+/*static*/ const char* LLTextureEntry::TEXTURE_MEDIA_DATA_KEY = TEXTURE_MEDIA_DATA_KEY_STR;
+
+static const std::string MEDIA_VERSION_STRING_PREFIX = "x-mv:";
+
+// static 
+LLTextureEntry* LLTextureEntry::newTextureEntry()
+{
+        return new LLTextureEntry();
+}
+
 //===============================================================
 LLTextureEntry::LLTextureEntry()
+  : mMediaEntry(NULL)
 {
         init(LLUUID::null,1.f,1.f,0.f,0.f,0.f,DEFAULT_BUMP_CODE);
 }
 
 LLTextureEntry::LLTextureEntry(const LLUUID& tex_id)
+  : mMediaEntry(NULL)
 {
         init(tex_id,1.f,1.f,0.f,0.f,0.f,DEFAULT_BUMP_CODE);
 }
 
 LLTextureEntry::LLTextureEntry(const LLTextureEntry &rhs)
+  : mMediaEntry(NULL)
 {
         mID = rhs.mID;
         mScaleS = rhs.mScaleS;
@@ -62,6 +89,10 @@ LLTextureEntry::LLTextureEntry(const LLTextureEntry &rhs)
         mBump = rhs.mBump;
         mMediaFlags = rhs.mMediaFlags;
         mGlow = rhs.mGlow;
+        if (rhs.mMediaEntry != NULL) {
+                // Make a copy
+                mMediaEntry = new LLMediaEntry(*rhs.mMediaEntry);
+        }
 }
 
 LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs)
@@ -78,6 +109,16 @@ LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs)
                 mBump = rhs.mBump;
                 mMediaFlags = rhs.mMediaFlags;
                 mGlow = rhs.mGlow;
+                if (mMediaEntry != NULL) {
+                        delete mMediaEntry;
+                }
+                if (rhs.mMediaEntry != NULL) {
+                        // Make a copy
+                        mMediaEntry = new LLMediaEntry(*rhs.mMediaEntry);
+                }
+                else {
+                        mMediaEntry = NULL;
+                }
         }
 
         return *this;
@@ -97,10 +138,19 @@ void LLTextureEntry::init(const LLUUID& tex_id, F32 scale_s, F32 scale_t, F32 of
     mGlow = 0;
         
         setColor(LLColor4(1.f, 1.f, 1.f, 1.f));
+        if (mMediaEntry != NULL) {
+            delete mMediaEntry;
+        }
+        mMediaEntry = NULL;
 }
 
 LLTextureEntry::~LLTextureEntry()
 {
+        if(mMediaEntry)
+        {
+                delete mMediaEntry;
+                mMediaEntry = NULL;
+        }
 }
 
 bool LLTextureEntry::operator!=(const LLTextureEntry &rhs) const
@@ -136,23 +186,33 @@ bool LLTextureEntry::operator==(const LLTextureEntry &rhs) const
 LLSD LLTextureEntry::asLLSD() const
 {
         LLSD sd;
+        asLLSD(sd);
+        return sd;
+}
 
-        sd["imageid"] = getID();
-        sd["colors"] = ll_sd_from_color4(getColor());
+void LLTextureEntry::asLLSD(LLSD& sd) const
+{
+        sd["imageid"] = mID;
+        sd["colors"] = ll_sd_from_color4(mColor);
         sd["scales"] = mScaleS;
         sd["scalet"] = mScaleT;
         sd["offsets"] = mOffsetS;
         sd["offsett"] = mOffsetT;
-        sd["imagerot"] = getRotation();
+        sd["imagerot"] = mRotation;
         sd["bump"] = getBumpShiny();
         sd["fullbright"] = getFullbright();
-        sd["media_flags"] = getMediaTexGen();
-        sd["glow"] = getGlow();
-        
-        return sd;
+        sd["media_flags"] = mMediaFlags;
+        if (hasMedia()) {
+                LLSD mediaData;
+        if (NULL != getMediaData()) {
+            getMediaData()->asLLSD(mediaData);
+        }
+                sd[TEXTURE_MEDIA_DATA_KEY] = mediaData;
+        }
+        sd["glow"] = mGlow;
 }
 
-bool LLTextureEntry::fromLLSD(LLSD& sd)
+bool LLTextureEntry::fromLLSD(const LLSD& sd)
 {
         const char *w, *x;
         w = "imageid";
@@ -197,6 +257,17 @@ bool LLTextureEntry::fromLLSD(LLSD& sd)
         {
                 setMediaTexGen( sd[w].asInteger() );
         } else goto fail;
+        // If the "has media" flag doesn't match the fact that 
+        // media data exists, updateMediaData will "fix" it
+        // by either clearing or setting the flag
+        w = TEXTURE_MEDIA_DATA_KEY;
+        if (hasMedia() != sd.has(w))
+        {
+                llwarns << "LLTextureEntry::fromLLSD: media_flags (" << hasMedia() <<
+                        ") does not match presence of media_data (" << sd.has(w) << ").  Fixing." << llendl;
+        }
+        updateMediaData(sd[w]);
+
         w = "glow";
         if (sd.has(w))
         {
@@ -208,6 +279,19 @@ fail:
         return false;
 }
 
+// virtual 
+// override this method for each derived class
+LLTextureEntry* LLTextureEntry::newBlank() const
+{
+        return new LLTextureEntry();
+}
+
+// virtual 
+LLTextureEntry* LLTextureEntry::newCopy() const
+{
+        return new LLTextureEntry(*this);
+}
+
 S32 LLTextureEntry::setID(const LLUUID &tex_id)
 {
         if (mID != tex_id)
@@ -215,7 +299,7 @@ S32 LLTextureEntry::setID(const LLUUID &tex_id)
                 mID = tex_id;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setScale(F32 s, F32 t)
@@ -233,6 +317,28 @@ S32 LLTextureEntry::setScale(F32 s, F32 t)
         return retval;
 }
 
+S32 LLTextureEntry::setScaleS(F32 s)
+{
+        S32 retval = TEM_CHANGE_NONE;
+        if (mScaleS != s)
+        {
+                mScaleS = s;
+                retval = TEM_CHANGE_TEXTURE;
+        }
+        return retval;
+}
+
+S32 LLTextureEntry::setScaleT(F32 t)
+{
+        S32 retval = TEM_CHANGE_NONE;
+        if (mScaleT != t)
+        {
+                mScaleT = t;
+                retval = TEM_CHANGE_TEXTURE;
+        }
+        return retval;
+}
+
 S32 LLTextureEntry::setColor(const LLColor4 &color)
 {
         if (mColor != color)
@@ -240,7 +346,7 @@ S32 LLTextureEntry::setColor(const LLColor4 &color)
                 mColor = color;
                 return TEM_CHANGE_COLOR;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setColor(const LLColor3 &color)
@@ -251,7 +357,7 @@ S32 LLTextureEntry::setColor(const LLColor3 &color)
                 mColor.setVec(color);
                 return TEM_CHANGE_COLOR;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setAlpha(const F32 alpha)
@@ -261,7 +367,7 @@ S32 LLTextureEntry::setAlpha(const F32 alpha)
                 mColor.mV[VW] = alpha;
                 return TEM_CHANGE_COLOR;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setOffset(F32 s, F32 t)
@@ -279,6 +385,28 @@ S32 LLTextureEntry::setOffset(F32 s, F32 t)
         return retval;
 }
 
+S32 LLTextureEntry::setOffsetS(F32 s)
+{
+        S32 retval = 0;
+        if (mOffsetS != s)
+        {
+                mOffsetS = s;
+                retval = TEM_CHANGE_TEXTURE;
+        }
+        return retval;
+}
+
+S32 LLTextureEntry::setOffsetT(F32 t)
+{
+        S32 retval = 0;
+        if (mOffsetT != t)
+        {
+                mOffsetT = t;
+                retval = TEM_CHANGE_TEXTURE;
+        }
+        return retval;
+}
+
 S32 LLTextureEntry::setRotation(F32 theta)
 {
         if (mRotation != theta)
@@ -286,7 +414,7 @@ S32 LLTextureEntry::setRotation(F32 theta)
                 mRotation = theta;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setBumpShinyFullbright(U8 bump)
@@ -296,7 +424,7 @@ S32 LLTextureEntry::setBumpShinyFullbright(U8 bump)
                 mBump = bump;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setMediaTexGen(U8 media)
@@ -304,9 +432,21 @@ S32 LLTextureEntry::setMediaTexGen(U8 media)
         if (mMediaFlags != media)
         {
                 mMediaFlags = media;
-                return TEM_CHANGE_TEXTURE;
+
+                // Special code for media handling
+                if( hasMedia() && mMediaEntry == NULL)
+                {
+                        mMediaEntry = new LLMediaEntry;
+                }
+        else if ( ! hasMedia() && mMediaEntry != NULL)
+        {
+            delete mMediaEntry;
+            mMediaEntry = NULL;
+        }
+
+                return TEM_CHANGE_MEDIA;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setBumpmap(U8 bump)
@@ -318,7 +458,7 @@ S32 LLTextureEntry::setBumpmap(U8 bump)
                 mBump |= bump;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setFullbright(U8 fullbright)
@@ -330,7 +470,7 @@ S32 LLTextureEntry::setFullbright(U8 fullbright)
                 mBump |= fullbright << TEM_FULLBRIGHT_SHIFT;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setShiny(U8 shiny)
@@ -342,7 +482,7 @@ S32 LLTextureEntry::setShiny(U8 shiny)
                 mBump |= shiny << TEM_SHINY_SHIFT;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setBumpShiny(U8 bump_shiny)
@@ -354,7 +494,7 @@ S32 LLTextureEntry::setBumpShiny(U8 bump_shiny)
                 mBump |= bump_shiny;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setMediaFlags(U8 media_flags)
@@ -364,9 +504,21 @@ S32 LLTextureEntry::setMediaFlags(U8 media_flags)
         {
                 mMediaFlags &= ~TEM_MEDIA_MASK;
                 mMediaFlags |= media_flags;
-                return TEM_CHANGE_TEXTURE;
+        
+                // Special code for media handling
+                if( hasMedia() && mMediaEntry == NULL)
+                {
+                        mMediaEntry = new LLMediaEntry;
+                }
+        else if ( ! hasMedia() && mMediaEntry != NULL)
+        {
+            delete mMediaEntry;
+            mMediaEntry = NULL;
+        }
+        
+                return TEM_CHANGE_MEDIA;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setTexGen(U8 tex_gen)
@@ -378,7 +530,7 @@ S32 LLTextureEntry::setTexGen(U8 tex_gen)
                 mMediaFlags |= tex_gen;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
 }
 
 S32 LLTextureEntry::setGlow(F32 glow)
@@ -388,5 +540,115 @@ S32 LLTextureEntry::setGlow(F32 glow)
                 mGlow = glow;
                 return TEM_CHANGE_TEXTURE;
         }
-        return 0;
+        return TEM_CHANGE_NONE;
+}
+
+void LLTextureEntry::setMediaData(const LLMediaEntry &media_entry)
+{
+    mMediaFlags |= MF_HAS_MEDIA;
+    if (NULL != mMediaEntry)
+    {
+        delete mMediaEntry;
+    }
+    mMediaEntry = new LLMediaEntry(media_entry);
+}
+
+bool LLTextureEntry::updateMediaData(const LLSD& media_data)
+{
+        if (media_data.isUndefined())
+        {
+                // clear the media data
+        clearMediaData();
+                return false;
+        }
+        else {
+                mMediaFlags |= MF_HAS_MEDIA;
+                if (mMediaEntry == NULL)
+                {
+                        mMediaEntry = new LLMediaEntry;
+                }
+        // *NOTE: this will *clobber* all of the fields in mMediaEntry 
+        // with whatever fields are present (or not present) in media_data!
+                mMediaEntry->fromLLSD(media_data);
+                return true;
+        }
+}
+
+void LLTextureEntry::clearMediaData()
+{
+    mMediaFlags &= ~MF_HAS_MEDIA;
+    if (mMediaEntry != NULL) {
+        delete mMediaEntry;
+    }
+    mMediaEntry = NULL;
+}    
+
+void LLTextureEntry::mergeIntoMediaData(const LLSD& media_fields)
+{
+    mMediaFlags |= MF_HAS_MEDIA;
+    if (mMediaEntry == NULL)
+    {
+        mMediaEntry = new LLMediaEntry;
+    }
+    // *NOTE: this will *merge* the data in media_fields
+    // with the data in our media entry
+    mMediaEntry->mergeFromLLSD(media_fields);
+}
+
+//static
+std::string LLTextureEntry::touchMediaVersionString(const std::string &in_version, const LLUUID &agent_id)
+{
+    // XXX TODO: make media version string binary (base64-encoded?)
+    // Media "URL" is a representation of a version and the last-touched agent
+    // x-mv:nnnnn/agent-id
+    // where "nnnnn" is version number
+    // *NOTE: not the most efficient code in the world...
+    U32 current_version = getVersionFromMediaVersionString(in_version) + 1;
+    const size_t MAX_VERSION_LEN = 10; // 2^32 fits in 10 decimal digits
+    char buf[MAX_VERSION_LEN+1];
+    snprintf(buf, (int)MAX_VERSION_LEN+1, "%0*u", (int)MAX_VERSION_LEN, current_version);  // added int cast to fix warning/breakage on mac.
+    return MEDIA_VERSION_STRING_PREFIX + buf + "/" + agent_id.asString();
+}
+
+//static
+U32 LLTextureEntry::getVersionFromMediaVersionString(const std::string &version_string)
+{
+    U32 version = 0;
+    if (!version_string.empty()) 
+    {
+        size_t found = version_string.find(MEDIA_VERSION_STRING_PREFIX);
+        if (found != std::string::npos) 
+        {
+            found = version_string.find_first_of("/", found);
+            std::string v = version_string.substr(MEDIA_VERSION_STRING_PREFIX.length(), found);
+            version = strtoul(v.c_str(),NULL,10);
+        }
+    }
+    return version;
+}
+
+//static
+LLUUID LLTextureEntry::getAgentIDFromMediaVersionString(const std::string &version_string)
+{
+    LLUUID id;
+    if (!version_string.empty()) 
+    {
+        size_t found = version_string.find(MEDIA_VERSION_STRING_PREFIX);
+        if (found != std::string::npos) 
+        {
+            found = version_string.find_first_of("/", found);
+            if (found != std::string::npos) 
+            {
+                std::string v = version_string.substr(found + 1);
+                id.set(v);
+            }
+        }
+    }
+    return id;
+}
+
+//static
+bool LLTextureEntry::isMediaVersionString(const std::string &version_string)
+{
+        return std::string::npos != version_string.find(MEDIA_VERSION_STRING_PREFIX);
 }