diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-01 17:17:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-01 17:17:29 +0100 |
| commit | c4941fc182585769e8e3151f98127c9b8c3221f2 (patch) | |
| tree | 84e347ae2573ce5b538f124a0ce95f3a50fc69c7 /indra/newview/lltoastalertpanel.cpp | |
| parent | ae099c639fe45a13454d50526b1c8610ee98ea83 (diff) | |
| parent | ee2720d0a1d9153547a6012d6b31c6bfff4e37a7 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltoastalertpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastalertpanel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index 495c9c1f44..f31e3cfb14 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -268,14 +268,15 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal mLineEditor->setMaxTextChars(edit_text_max_chars); mLineEditor->setText(edit_text_contents); - if("SaveOutfitAs" == mNotification->getName()) + std::string notif_name = mNotification->getName(); + if (("SaveOutfitAs" == notif_name) || ("SaveSettingAs" == notif_name)) { mLineEditor->setPrevalidate(&LLTextValidate::validateASCII); } // decrease limit of line editor of teleport offer dialog to avoid truncation of // location URL in invitation message, see EXT-6891 - if ("OfferTeleport" == mNotification->getName()) + if ("OfferTeleport" == notif_name) { mLineEditor->setMaxTextLength(gSavedSettings.getS32( "teleport_offer_invitation_max_length")); |