From 1c909afe3998778e4cc045c9ab733e8afbf7c25b Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Wed, 2 May 2007 21:24:47 +0000
Subject: svn merge -r 60342:61148
 svn+ssh://svn/svn/linden/branches/maintenance into release

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

(limited to 'indra/llimage')

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 9b37cdade5..b6f6cdfc24 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1402,7 +1402,7 @@ void LLImageFormatted::sanityCheck()
 
 BOOL LLImageFormatted::copyData(U8 *data, S32 size)
 {
-	if ( (data && data != getData()) || (size != getDataSize()) )
+	if ( data && ((data != getData()) || (size != getDataSize())) )
 	{
 		deleteData();
 		allocateData(size);
-- 
cgit v1.2.3