diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-21 13:26:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-21 13:26:15 -0400 |
| commit | e766d9e697eae29b3f82106603843efbeb7aa01b (patch) | |
| tree | 872a0ab94d81699ec3ea1f7113c9c56e2a2486d3 /indra/newview/llnotificationlistitem.cpp | |
| parent | d26c931ae2c5d33adc5fc20842b7be838a2822b4 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
DRTVWR-447: Merge up to latest viewer-release
Diffstat (limited to 'indra/newview/llnotificationlistitem.cpp')
| -rw-r--r-- | indra/newview/llnotificationlistitem.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp index cbcf9cac9c..f2de8e54a0 100644 --- a/indra/newview/llnotificationlistitem.cpp +++ b/indra/newview/llnotificationlistitem.cpp @@ -288,9 +288,7 @@ BOOL LLGroupInviteNotificationListItem::postBuild() //invitation with any non-default group role, doesn't have newline characters at the end unlike simple invitations std::string invitation_desc = mNoticeTextExp->getValue().asString(); - boost::regex pattern = boost::regex("\n\n$", boost::regex::perl|boost::regex::icase); - boost::match_results<std::string::const_iterator> matches; - if(!boost::regex_search(invitation_desc, matches, pattern)) + if (invitation_desc.substr(invitation_desc.size() - 2) != "\n\n") { invitation_desc += "\n\n"; mNoticeTextExp->setValue(invitation_desc); |