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/llconfirmationmanager.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llconfirmationmanager.cpp')
| -rw-r--r-- | indra/newview/llconfirmationmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llconfirmationmanager.cpp b/indra/newview/llconfirmationmanager.cpp index 1c62b70b4c..167afb8062 100644 --- a/indra/newview/llconfirmationmanager.cpp +++ b/indra/newview/llconfirmationmanager.cpp @@ -59,7 +59,7 @@ static void onConfirmAlert(S32 option, void* data) } static void onConfirmAlertPassword( - S32 option, const LLString& text, void* data) + S32 option, const std::string& text, void* data) { LLConfirmationManager::ListenerBase* listener = (LLConfirmationManager::ListenerBase*)data; @@ -77,7 +77,7 @@ void LLConfirmationManager::confirm(Type type, const std::string& action, ListenerBase* listener) { - LLString::format_map_t args; + LLStringUtil::format_map_t args; args["[ACTION]"] = action; switch (type) @@ -91,7 +91,7 @@ void LLConfirmationManager::confirm(Type type, gViewerWindow->alertXmlEditText("ConfirmPurchasePassword", args, NULL, NULL, onConfirmAlertPassword, listener, - LLString::format_map_t(), + LLStringUtil::format_map_t(), TRUE); break; case TYPE_NONE: |