summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterwater.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterwater.h')
-rw-r--r--indra/newview/llfloaterwater.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h
index 311ef9a75e..883b2a35f1 100644
--- a/indra/newview/llfloaterwater.h
+++ b/indra/newview/llfloaterwater.h
@@ -61,9 +61,9 @@ public:
// help button stuff
static void onClickHelp(void* data);
- void initHelpBtn(const char* name, const char* xml_alert);
+ void initHelpBtn(const std::string& name, const std::string& xml_alert);
- static void newPromptCallback(S32 option, const LLString& text, void* userData);
+ static void newPromptCallback(S32 option, const std::string& text, void* userData);
/// general purpose callbacks for dealing with color controllers
static void onColorControlRMoved(LLUICtrl* ctrl, void* userData);