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

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

diff --git a/indra/newview/llfloaterparcel.h b/indra/newview/llfloaterparcel.h
index c2d5987d8e..386acb3fd5 100644
--- a/indra/newview/llfloaterparcel.h
+++ b/indra/newview/llfloaterparcel.h
@@ -43,13 +43,13 @@ class LLFloaterParcelInfo
 public:
 	static	void*	createPanelPlace(void*	data);
 
-	LLFloaterParcelInfo( const LLUUID &parcel_id );
+	LLFloaterParcelInfo( const LLSD& parcel_id );
 	/*virtual*/ ~LLFloaterParcelInfo();
-
+	
+	/*virtual*/ BOOL postBuild();
+	
 	void displayParcelInfo(const LLUUID& parcel_id);
 
-	static LLFloaterParcelInfo* show(const LLUUID& parcel_id);
-
 private:
 	LLUUID			mParcelID;			// for which parcel is this window?
 	LLPanelPlace*	mPanelParcelp;
-- 
cgit v1.2.3