From e596df5f4e84229f0c7edf02490197e3cef33f70 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 10 Sep 2010 11:11:16 +0200
Subject: fix conversion that is ambiguous for linux64 gcc; introduced in
 11e4c300

maybe squash with 11e4c300
---
 linden/indra/newview/llfloaterassetbrowser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/llfloaterassetbrowser.cpp b/linden/indra/newview/llfloaterassetbrowser.cpp
index 9b41390..ca0e8d1 100644
--- a/linden/indra/newview/llfloaterassetbrowser.cpp
+++ b/linden/indra/newview/llfloaterassetbrowser.cpp
@@ -122,7 +122,7 @@ void LLFloaterAssetBrowser::createThumbnails()
 		temp.mUUID = itemp->getUUID();
 		temp.mName = itemp->getName();
 		temp.mTexturep = NULL;
-		temp.mAssetRect = NULL;
+		temp.mAssetRect = LLRect::null;
 		mTextureAssets.push_back(temp);
 	}
 	
-- 
cgit v1.1