diff options
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 6309cec819..d6c27a31bc 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -47,6 +47,7 @@ #include "lltimer.h" #include "llstat.h" #include "llalertdialog.h" +#include "llnotifications.h" class LLView; class LLViewerObject; @@ -353,20 +354,10 @@ public: void drawPickBuffer() const; - LLAlertDialog* alertXml(const std::string& xml_filename, - LLAlertDialog::alert_callback_t callback = NULL, void* user_data = NULL); - LLAlertDialog* alertXml(const std::string& xml_filename, const LLStringUtil::format_map_t& args, - LLAlertDialog::alert_callback_t callback = NULL, void* user_data = NULL); - LLAlertDialog* alertXmlEditText(const std::string& xml_filename, const LLStringUtil::format_map_t& args, - LLAlertDialog::alert_callback_t callback, void* user_data, - LLAlertDialog::alert_text_callback_t text_callback, void *text_data, - const LLStringUtil::format_map_t& edit_args = LLStringUtil::format_map_t(), - BOOL draw_asterixes = FALSE); - - static bool alertCallback(S32 modal); - private: bool shouldShowToolTipFor(LLMouseHandler *mh); + static bool onAlert(const LLSD& notify); + void switchToolByMask(MASK mask); void destroyWindow(); void drawMouselookInstructions(); |