From 76f6dba9e4a34a34c5100807f685790ad6f5129b Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 9 Mar 2010 12:27:41 -0800
Subject: fixed bad merge

---
 indra/llui/llcombobox.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 4f27588467..82134c4ffe 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -230,6 +230,7 @@ private:
 	commit_callback_t	mPrearrangeCallback;
 	commit_callback_t	mTextEntryCallback;
 	commit_callback_t	mSelectionCallback;
+	boost::signals2::connection mTopLostSignalConnection;
 	S32                 mLastSelectedIndex;
 };
 #endif
-- 
cgit v1.2.3