1 files changed, 35 insertions, 41 deletions

diff --git a/linden/indra/llmedia/llmediaimplexample2.h b/linden/indra/llmath/llsdutil_math.h
index 6a4f80b..5b64942 100644..100755
--- a/linden/indra/llmedia/llmediaimplexample2.h
+++ b/linden/indra/llmath/llsdutil_math.h
@@ -1,10 +1,12 @@
-/**
- * @file llmediaimplexample2.h
- * @brief Example 2 of a media impl concrete class
+/** 
+ * @file llsdutil_math.h
+ * @author Brad
+ * @date 2009-05-19
+ * @brief Utility classes, functions, etc, for using structured data with math classes.
  *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
  * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
+ * Copyright (c) 2009-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -30,47 +32,39 @@
  * $/LicenseInfo$
  */
 
-#ifndef LLMEDIAIMPLEXAMPLE2_H
-#define LLMEDIAIMPLEXAMPLE2_H
+#ifndef LL_LLSDUTIL_MATH_H
+#define LL_LLSDUTIL_MATH_H
 
-#include "llmediaimplcommon.h"
-#include "llmediaimplfactory.h"
+class LL_COMMON_API LLSD;
 
-class LLMediaManagerData;
-class LLMediaImplMaker;
+// vector3
+class LLVector3;
+LLSD ll_sd_from_vector3(const LLVector3& vec);
+LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index = 0);
 
-class LLMediaImplExample2 :
-        public LLMediaImplCommon
-{
-        public:
-                LLMediaImplExample2();
+// vector4
+class LLVector4;
+LLSD ll_sd_from_vector4(const LLVector4& vec);
+LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index = 0);
 
-                static bool startup( LLMediaManagerData* init_data );
-                static bool closedown();
+// vector3d (double)
+class LLVector3d;
+LLSD ll_sd_from_vector3d(const LLVector3d& vec);
+LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index = 0);
 
-                /* virtual */ bool init();
-                /* virtual */ bool navigateTo( const std::string url );
-                /* virtual */ bool load( const std::string url );
-                /* virtual */ std::string getVersion();
-                /* virtual */ bool updateMedia();
-                /* virtual */ unsigned char* getMediaData();
-                /* virtual */ bool reset();
-        /* virtual */ bool setRequestedMediaSize( int width, int height );
+// vector2
+class LLVector2;
+LLSD ll_sd_from_vector2(const LLVector2& vec);
+LLVector2 ll_vector2_from_sd(const LLSD& sd);
 
-        private:
-                unsigned char* mMediaPixels;
-                int mXpos;
-                int mYpos;
-};
+// Quaternion
+class LLQuaternion;
+LLSD ll_sd_from_quaternion(const LLQuaternion& quat);
+LLQuaternion ll_quaternion_from_sd(const LLSD& sd);
 
-class LLMediaImplExample2Maker : public LLMediaImplMaker
-{
-        public:
-                LLMediaImplExample2Maker();
-                LLMediaImplExample2* create()
-                {
-                        return new LLMediaImplExample2();
-                }
-};
+// color4
+class LLColor4;
+LLSD ll_sd_from_color4(const LLColor4& c);
+LLColor4 ll_color4_from_sd(const LLSD& sd);
 
-#endif  // LLMEDIAIMPLEXAMPLE2_H
+#endif // LL_LLSDUTIL_MATH_H