Second Life viewer sources 1.23.0-RC

1 files changed, 5 insertions, 4 deletions

diff --git a/linden/indra/newview/llfloaterwater.h b/linden/indra/newview/llfloaterwater.h
index 5c1fced..774d5c5 100644
--- a/linden/indra/newview/llfloaterwater.h
+++ b/linden/indra/newview/llfloaterwater.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -63,7 +64,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 +98,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);