aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewercontrol.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llviewercontrol.h
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llviewercontrol.h')
-rw-r--r--linden/indra/newview/llviewercontrol.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index 4be4313..d9a2682 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -46,6 +46,7 @@ public:
46 static void show(void*); 46 static void show(void*);
47 static void onSettingSelect(LLUICtrl* ctrl, void* user_data); 47 static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
48 static void onCommitSettings(LLUICtrl* ctrl, void* user_data); 48 static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
49 static void onClickDefault(void* user_data);
49 50
50protected: 51protected:
51 static LLFloaterSettingsDebug* sInstance; 52 static LLFloaterSettingsDebug* sInstance;
@@ -54,6 +55,7 @@ protected:
54 55
55//setting variables are declared in this function 56//setting variables are declared in this function
56void declare_settings(); 57void declare_settings();
58void settings_version_fixup();
57 59
58// saved at end of session 60// saved at end of session
59extern LLControlGroup gSavedSettings; 61extern LLControlGroup gSavedSettings;