summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewercontrol.h')
-rw-r--r--indra/newview/llviewercontrol.h31
1 files changed, 28 insertions, 3 deletions
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h
index 2727e36b53..c2a9dc9096 100644
--- a/indra/newview/llviewercontrol.h
+++ b/indra/newview/llviewercontrol.h
@@ -32,8 +32,9 @@
#ifndef LL_LLVIEWERCONTROL_H
#define LL_LLVIEWERCONTROL_H
-#include <map>
#include "llcontrol.h"
+#include "llfloater.h"
+#include "lltexteditor.h"
// Enabled this definition to compile a 'hacked' viewer that
// allows a hacked godmode to be toggled on and off.
@@ -42,12 +43,33 @@
extern BOOL gHackGodmode;
#endif
+class LLFloaterSettingsDebug : public LLFloater
+{
+public:
+ LLFloaterSettingsDebug();
+ virtual ~LLFloaterSettingsDebug();
+
+ virtual BOOL postBuild();
+ virtual void draw();
+
+ void updateControl(LLControlBase* 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;
+};
+
// These functions found in llcontroldef.cpp *TODO: clean this up!
//setting variables are declared in this function
+void declare_settings();
+void fixup_settings();
void settings_setup_listeners();
-extern std::map<LLString, LLControlGroup*> gSettings;
-
// for the graphics settings
void create_graphics_group(LLControlGroup& group);
@@ -68,4 +90,7 @@ extern LLControlGroup gCrashSettings;
extern LLString gLastRunVersion;
extern LLString gCurrentVersion;
+extern LLString gSettingsFileName;
+extern LLString gPerAccountSettingsFileName;
+
#endif // LL_LLVIEWERCONTROL_H