From eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:12:59 +0000
Subject: svn merge -r 128442:129343
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

---
 indra/newview/llfloaterlandholdings.h | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/llfloaterlandholdings.h b/indra/newview/llfloaterlandholdings.h
index def77cf2a8..471ddf7f44 100644
--- a/indra/newview/llfloaterlandholdings.h
+++ b/indra/newview/llfloaterlandholdings.h
@@ -44,10 +44,11 @@ class LLFloaterLandHoldings
 :	public LLFloater
 {
 public:
-	BOOL postBuild();
-
-	static void show(void*);
-
+	LLFloaterLandHoldings(const LLSD& key);
+	virtual ~LLFloaterLandHoldings();
+	
+	virtual BOOL postBuild();
+	virtual void onOpen(const LLSD& key);
 	virtual void draw();
 
 	void refresh();
@@ -63,14 +64,9 @@ public:
 	static void onGrantList(void* data);
 
 protected:
-	LLFloaterLandHoldings();
-	virtual ~LLFloaterLandHoldings();
-
 	void refreshAggregates();
 
 protected:
-	static LLFloaterLandHoldings* sInstance;
-
 	// Sum up as packets arrive the total holdings
 	S32 mActualArea;
 	S32 mBillableArea;
-- 
cgit v1.2.3