From 73f0b5029aa247a563862fc39152ce58baa407aa Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 18 Jan 2007 00:36:25 +0000
Subject: merge -r 56738:56842 maintenance.

---
 indra/newview/lltexlayer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/lltexlayer.cpp')

diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index bc35b90086..33e191cc9c 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -468,7 +468,7 @@ void LLTexLayerSetBuffer::readBackAndUpload(U8* baked_bump_data)
 // static
 void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* userdata, S32 result) // StoreAssetData callback (not fixed)
 {
-	LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)(U32)userdata;
+	LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)userdata;
 
 	LLVOAvatar* avatar = gAgent.getAvatarObject();
 
-- 
cgit v1.2.3