Merge remote branch 'mccabe/1.3.0-next' into next

Conflicts:
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/skins/default/xui/de/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/ja/floater_about.xml
	linden/indra/newview/skins/default/xui/ko/floater_about.xml
	linden/indra/newview/skins/default/xui/zh/floater_about.xml
	linden/install.xml

1 files changed, 13 insertions, 6 deletions

diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index c735cb0..980ff56 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -17,7 +17,8 @@
  * 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://secondlifegrid.net/programs/open_source/licensing/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,
@@ -40,6 +41,9 @@
 #include <map>
 #include <list>
 
+#define MIN_VIDEO_RAM_IN_MEGA_BYTES    32
+#define MAX_VIDEO_RAM_IN_MEGA_BYTES    512 // 512MB max for performance reasons.
+
 class LLViewerImage;
 
 typedef void    (*loaded_callback_func)( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
@@ -180,10 +184,11 @@ public:
 
         /*virtual*/ bool bindError(const S32 stage = 0) const;
         /*virtual*/ bool bindDefaultImage(const S32 stage = 0) const;
+        /*virtual*/ void forceImmediateUpdate() ;
         
         void reinit(BOOL usemipmaps = TRUE);
 
-        const LLUUID& getID() { return mID; }
+        const LLUUID& getID() const { return mID; }
 
         // New methods for determining image quality/priority
         // texel_area_ratio is ("scaled" texel area)/(original texel area), approximately.
@@ -201,6 +206,7 @@ public:
 
          // ONLY call from LLViewerImageList
         BOOL createTexture(S32 usename = 0);
+        void destroyTexture() ;
 
         BOOL needsAux() const                                                   { return mNeedsAux; }
 
@@ -357,10 +363,11 @@ public:
         static LLTimer sEvaluationTimer;
         static F32 sDesiredDiscardBias;
         static F32 sDesiredDiscardScale;
-        static S32 sBoundTextureMemory;
-        static S32 sTotalTextureMemory;
-        static S32 sMaxBoundTextureMem;
-        static S32 sMaxTotalTextureMem;
+        static S32 sBoundTextureMemoryInBytes;
+        static S32 sTotalTextureMemoryInBytes;
+        static S32 sMaxBoundTextureMemInMegaBytes;
+        static S32 sMaxTotalTextureMemInMegaBytes;
+        static S32 sMaxDesiredTextureMemInBytes ;
         static BOOL sDontLoadVolumeTextures;
 };