diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llfloaterwindlight.h | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterwindlight.h')
-rw-r--r-- | linden/indra/newview/llfloaterwindlight.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h index 3e5556b..3447caa 100644 --- a/linden/indra/newview/llfloaterwindlight.h +++ b/linden/indra/newview/llfloaterwindlight.h | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -63,7 +64,7 @@ public: | |||
63 | static void onClickHelp(void* data); | 64 | static void onClickHelp(void* data); |
64 | void initHelpBtn(const std::string& name, const std::string& xml_alert); | 65 | void initHelpBtn(const std::string& name, const std::string& xml_alert); |
65 | 66 | ||
66 | static void newPromptCallback(S32 option, const std::string& text, void* userData); | 67 | static bool newPromptCallback(const LLSD& notification, const LLSD& response); |
67 | 68 | ||
68 | /// general purpose callbacks for dealing with color controllers | 69 | /// general purpose callbacks for dealing with color controllers |
69 | static void onColorControlRMoved(LLUICtrl* ctrl, void* userData); | 70 | static void onColorControlRMoved(LLUICtrl* ctrl, void* userData); |
@@ -94,13 +95,13 @@ public: | |||
94 | static void onSavePreset(void* userData); | 95 | static void onSavePreset(void* userData); |
95 | 96 | ||
96 | /// prompts a user when overwriting a preset | 97 | /// prompts a user when overwriting a preset |
97 | static void saveAlertCallback(S32 option, void* userdata); | 98 | static bool saveAlertCallback(const LLSD& notification, const LLSD& response); |
98 | 99 | ||
99 | /// when user hits the save preset button | 100 | /// when user hits the save preset button |
100 | static void onDeletePreset(void* userData); | 101 | static void onDeletePreset(void* userData); |
101 | 102 | ||
102 | /// prompts a user when overwriting a preset | 103 | /// prompts a user when overwriting a preset |
103 | static void deleteAlertCallback(S32 option, void* userdata); | 104 | bool deleteAlertCallback(const LLSD& notification, const LLSD& response); |
104 | 105 | ||
105 | /// what to do when you change the preset name | 106 | /// what to do when you change the preset name |
106 | static void onChangePresetName(LLUICtrl* ctrl, void* userData); | 107 | static void onChangePresetName(LLUICtrl* ctrl, void* userData); |