diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/llfloaterwater.h | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/llfloaterwater.h')
| -rw-r--r-- | indra/newview/llfloaterwater.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index 883b2a35f1..ad361266fe 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -63,7 +63,7 @@ public: static void onClickHelp(void* data); void initHelpBtn(const std::string& name, const std::string& xml_alert); - static void newPromptCallback(S32 option, const std::string& text, void* userData); + static bool newPromptCallback(const LLSD& notification, const LLSD& response); /// general purpose callbacks for dealing with color controllers static void onColorControlRMoved(LLUICtrl* ctrl, void* userData); @@ -97,13 +97,13 @@ public: static void onSavePreset(void* userData); /// prompts a user when overwriting a preset - static void saveAlertCallback(S32 option, void* userdata); + static bool saveAlertCallback(const LLSD& notification, const LLSD& response); /// when user hits the save preset button static void onDeletePreset(void* userData); /// prompts a user when overwriting a preset - static void deleteAlertCallback(S32 option, void* userdata); + static bool deleteAlertCallback(const LLSD& notification, const LLSD& response); /// what to do when you change the preset name static void onChangePresetName(LLUICtrl* ctrl, void* userData); |