QAR-1602 checkpoint for multiple textures

 Fixing merge problems - updating LLLocalTextureObject (new class) to work with Bao's texture refactoring.

 -Nyx

indra/newview/lllocaltextureobject.cpp

@@ -34,7 +34,7 @@
 #include "lllocaltextureobject.h"
 
 #include "lltexlayer.h"
-#include "llviewerimage.h"
+#include "llviewertexture.h"
 #include "lltextureentry.h"
 #include "lluuid.h"
 
@@ -46,7 +46,7 @@ LLLocalTextureObject::LLLocalTextureObject() :
 	mImage = NULL;
 }
 
-LLLocalTextureObject::LLLocalTextureObject(LLViewerImage *image, LLTextureEntry *entry, LLTexLayer *layer, LLUUID id)
+LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture *image, LLTextureEntry *entry, LLTexLayer *layer, LLUUID id)
 {
 	if (entry)
 	{
@@ -77,7 +77,7 @@ LLLocalTextureObject::~LLLocalTextureObject()
 {
 }
 
-LLViewerImage* LLLocalTextureObject::getImage() const
+LLViewerFetchedTexture* LLLocalTextureObject::getImage() const
 {
 	return mImage;
 }
@@ -107,7 +107,7 @@ BOOL LLLocalTextureObject::getBakedReady() const
 	return mIsBakedReady;
 }
 
-void LLLocalTextureObject::setImage(LLViewerImage* new_image)
+void LLLocalTextureObject::setImage(LLViewerFetchedTexture* new_image)
 {
 	mImage = new_image;
 }

indra/newview/lllocaltextureobject.h

@@ -35,7 +35,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class LLViewerImage;
+class LLViewerFetchedTexture;
 class LLUUID;
 class LLTexLayer;
 class LLTextureEntry;
@@ -47,18 +47,18 @@ class LLLocalTextureObject
 {
 public:
 	LLLocalTextureObject();
-	LLLocalTextureObject(LLViewerImage *image, LLTextureEntry *entry, LLTexLayer *layer, LLUUID id);
+	LLLocalTextureObject(LLViewerFetchedTexture *image, LLTextureEntry *entry, LLTexLayer *layer, LLUUID id);
 	LLLocalTextureObject(const LLLocalTextureObject &lto);
 	~LLLocalTextureObject();
 
-	LLViewerImage* getImage() const;
+	LLViewerFetchedTexture* getImage() const;
 	LLTextureEntry* getTexEntry() const;
 	LLTexLayer* getTexLayer() const;
 	LLUUID		getID() const;
 	S32			getDiscard() const;
 	BOOL		getBakedReady() const;
 
-	void setImage(LLViewerImage* new_image);
+	void setImage(LLViewerFetchedTexture* new_image);
 	void setTexEntry(LLTextureEntry *new_te);
 	void setTexLayer(LLTexLayer *new_tex_layer);
 	void setID(LLUUID new_id);
@@ -69,7 +69,7 @@ class LLLocalTextureObject
 
 private:
 
-	LLPointer<LLViewerImage>  			mImage;
+	LLPointer<LLViewerFetchedTexture>  			mImage;
 	// NOTE: LLLocalTextureObject should be the exclusive owner of mTexEntry and mTexLayer
 	// using shared pointers here only for smart assignment & cleanup
 	// do NOT create new shared pointers to these objects, or keep pointers to them around