Merge of my DEV-36732 work and all the main line login api work that went on.

1 files changed, 7 insertions, 8 deletions

diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h
index ffd3fa30c8..ee54303267 100644
--- a/indra/newview/llfloaterbuy.h
+++ b/indra/newview/llfloaterbuy.h
@@ -52,13 +52,14 @@ class LLFloaterBuy
 : public LLFloater, public LLVOInventoryListener
 {
 public:
+	LLFloaterBuy(const LLSD& key);
+	~LLFloaterBuy();
+	
+	/*virtual*/	BOOL postBuild();
+	
 	static void show(const LLSaleInfo& sale_info);
 
 protected:
-	LLFloaterBuy();
-	~LLFloaterBuy();
-	/*virtual*/	BOOL	postBuild();
-	/*virtual*/ void onClose(bool app_quitting);
 	void reset();
 
 	void requestObjectInventories();
@@ -67,12 +68,10 @@ protected:
 								 S32 serial_num,
 								 void* data);
 
-	static void onClickBuy(void*);
-	static void onClickCancel(void*);
+	void onClickBuy();
+	void onClickCancel();
 
 private:
-	static LLFloaterBuy* sInstance;
-
 	LLSafeHandle<LLObjectSelection>	mObjectSelection;
 	LLSaleInfo mSaleInfo;
 };