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/llpanelclassified.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llpanelclassified.h b/indra/newview/llpanelclassified.h
index cc82d33d33..f28795a4f2 100644
--- a/indra/newview/llpanelclassified.h
+++ b/indra/newview/llpanelclassified.h
@@ -57,7 +57,7 @@ class LLMessageSystem;
 class LLPanelClassified : public LLPanel
 {
 public:
-    LLPanelClassified(BOOL in_finder, bool from_search = false);
+    LLPanelClassified(bool in_finder, bool from_search);
     /*virtual*/ ~LLPanelClassified();
 
 	void reset();
@@ -118,7 +118,7 @@ protected:
 	BOOL checkDirty();		// Update and return mDirty
 
 protected:
-	BOOL mInFinder;
+	bool mInFinder;
 	bool mFromSearch;		// from web-based "All" search sidebar
 	BOOL mDirty;
 	bool mForceClose;
-- 
cgit v1.2.3