Ported many texture engine changes from Snowglobe.

1 files changed, 10 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 5fad0a2..561e8e5 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -97,7 +97,7 @@ public:
                                                                          LLHost request_from_host = LLHost()
                                                                          );
         
-        LLViewerImage * getImageFromFile(const std::string& filename,
+        LLViewerImage * getImageFromUrl(const std::string& url,
                                                                          BOOL usemipmap = TRUE,
                                                                          BOOL level_immediate = FALSE,          // Get the requested level immediately upon creation.
                                                                          LLGLint internal_format = 0,
@@ -105,6 +105,14 @@ public:
                                                                          const LLUUID& force_id = LLUUID::null
                                                                          );
 
+        LLViewerImage * getImageFromFile(const std::string& filename,
+                                                                         BOOL usemipmap = TRUE,
+                                                                         BOOL level_immediate = FALSE,          // Get the requested level immediately upon creation.
+                                                                         LLGLint internal_format = 0,
+                                                                         LLGLenum primary_format = 0,
+                                                                         const LLUUID& force_id = LLUUID::null
+                                                                         );
+        
         // Request image from a specific host, used for baked avatar textures.
         // Implemented in header in case someone changes default params above. JC
         LLViewerImage* getImageFromHost(const LLUUID& image_id, LLHost host)
@@ -121,7 +129,7 @@ public:
         
         // Using image stats, determine what images are necessary, and perform image updates.
         void updateImages(F32 max_time);
-        void forceImmediateUpdate(LLViewerImage* imagep) ;
+        void bumpToMaxDecodePriority(LLViewerImage* imagep) ;
 
         // Decode and create textures for all images currently in list.
         void decodeAllImages(F32 max_decode_time);