diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llfloaterwindlight.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloaterwindlight.h')
| -rw-r--r-- | indra/newview/llfloaterwindlight.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwindlight.h b/indra/newview/llfloaterwindlight.h index 9bb7f1371c..d9e02b1117 100644 --- a/indra/newview/llfloaterwindlight.h +++ b/indra/newview/llfloaterwindlight.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); |