From ade6bbb06c6a842f39a3fe32decf7c66682df092 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 17:16:27 +0000
Subject: merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3

---
 indra/newview/llfloaterbump.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h
index f55a9e6bc5..b56817436c 100644
--- a/indra/newview/llfloaterbump.h
+++ b/indra/newview/llfloaterbump.h
@@ -44,13 +44,12 @@ class LLFloaterBump
 {
 	friend class LLUISingleton<LLFloaterBump, VisibilityPolicy<LLFloater> >;
 protected:
-	LLFloaterBump(const LLSD& key);
-	virtual ~LLFloaterBump();
-	
 	void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd);
 
 public:
 	/*virtual*/ void onOpen(const LLSD& key);
+	LLFloaterBump(const LLSD& key);
+	virtual ~LLFloaterBump();
 };
 
 #endif
-- 
cgit v1.2.3