From 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 19 Feb 2008 21:42:32 +0000
Subject: merge
 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986
 : 80178 -> release.

QAR-290 = QAR-271 + QAR-191
---
 indra/newview/lltexturectrl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/lltexturectrl.h')

diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index cad3980394..4a279d4084 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -44,6 +44,7 @@ class LLFloaterTexturePicker;
 class LLInventoryItem;
 class LLTextBox;
 class LLViewBorder;
+class LLViewerImage;
 
 // used for setting drag & drop callbacks.
 typedef BOOL (*drag_n_drop_callback)(LLUICtrl*, LLInventoryItem*, void*);
@@ -163,7 +164,7 @@ private:
 	LLUUID					 mImageAssetID;
 	LLUUID					 mDefaultImageAssetID;
 	LLString				 mDefaultImageName;
-	LLViewHandle			 mFloaterHandle;
+	LLHandle<LLFloater>			 mFloaterHandle;
 	LLTextBox*				 mTentativeLabel;
 	LLTextBox*				 mCaption;
 	LLString				 mLabel;
-- 
cgit v1.3