From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 08:04:56 +0000
Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
 ignore-dead-branch

---
 indra/newview/llfloatersettingsdebug.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index e08e6b5d74..0a98021c79 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -37,10 +37,14 @@
 #include "llfloater.h"
 #include "lltexteditor.h"
 
-class LLFloaterSettingsDebug : public LLFloater
+class LLFloaterSettingsDebug 
+:	public LLFloater, 
+	public LLFloaterSingleton<LLFloaterSettingsDebug>
 {
 public:
-	LLFloaterSettingsDebug();
+	// key - selects which settings to show, one of:
+	// "all", "base", "account", "skin"
+	LLFloaterSettingsDebug(const LLSD& key);
 	virtual ~LLFloaterSettingsDebug();
 
 	virtual BOOL postBuild();
@@ -48,13 +52,11 @@ public:
 
 	void updateControl(LLControlVariable* control);
 
-	static void show(void*);
 	static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
 	static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
 	static void onClickDefault(void* user_data);
 
 protected:
-	static LLFloaterSettingsDebug* sInstance;
 	LLTextEditor* mComment;
 };
 
-- 
cgit v1.2.3