1 files changed, 14 insertions, 2 deletions

diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index ca024fb..3b43e8f 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -141,7 +141,13 @@ public:
         /*virtual*/ BOOL unpack(LLDataPacker &dp);
         /*virtual*/ bool operator==(const LLNetworkData& data) const;
         /*virtual*/ void copy(const LLNetworkData& data);
+        // LLSD implementations here are provided by Eddy Stryker.
+        // NOTE: there are currently unused in protocols
+        LLSD asLLSD() const;
+        operator LLSD() const { return asLLSD(); }
+        bool fromLLSD(LLSD& sd);
 
+        
         void setColor(const LLColor4& color)    { mColor = color; mColor.clamp(); }
         void setRadius(F32 radius)                              { mRadius = llclamp(radius, LIGHT_MIN_RADIUS, LIGHT_MAX_RADIUS); }
         void setFalloff(F32 falloff)                    { mFalloff = llclamp(falloff, LIGHT_MIN_FALLOFF, LIGHT_MAX_FALLOFF); }
@@ -229,6 +235,9 @@ public:
         BOOL unpack(LLDataPacker &dp);
         bool operator==(const LLNetworkData& data) const;
         void copy(const LLNetworkData& data);
+        LLSD asLLSD() const;
+        operator LLSD() const { return asLLSD(); }
+        bool fromLLSD(LLSD& sd);
 };// end of attributes structure
 
 
@@ -245,6 +254,9 @@ public:
         /*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 setSculptTexture(const LLUUID& id) { mSculptTexture = id; }
         LLUUID getSculptTexture()               { return mSculptTexture; }