summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorpavelkproductengine <none@none>2015-02-04 15:48:22 +0200
committerpavelkproductengine <none@none>2015-02-04 15:48:22 +0200
commit5f96f3bba20fcacbe7115b7d27bc50cad56850d4 (patch)
treedaabcf9de36f4a116d5d65fee8e9aac296ffd848 /indra/newview
parentb31631934a7caa0fe331cd25e745e8b9c9485798 (diff)
MAINT-4734 (Separate transaction notices from group notice/invites) - fixed Mac build
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnotificationlistitem.cpp2
-rw-r--r--indra/newview/llnotificationlistitem.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index a55c7b8541..4fdd6b1a54 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -179,7 +179,7 @@ LLInviteNotificationListItem::LLInviteNotificationListItem(const Params& p)
if (!p.sender.empty())
{
LLStringUtil::format_map_t string_args;
- string_args["[SENDER_RESIDENT]"] = llformat("%s", p.sender);
+ string_args["[SENDER_RESIDENT]"] = llformat("%s", p.sender.c_str());
std::string sender_text = getString("sender_resident_text", string_args);
mSenderBox->setValue(sender_text);
mSenderBox->setVisible(TRUE);
diff --git a/indra/newview/llnotificationlistitem.h b/indra/newview/llnotificationlistitem.h
index bc77d873a4..89de0487be 100644
--- a/indra/newview/llnotificationlistitem.h
+++ b/indra/newview/llnotificationlistitem.h
@@ -60,8 +60,8 @@ public:
// get item's ID
LLUUID getID() { return mID; }
- std::string getTitle() { return mTitle; }
- std::string getNotificationName() { return mNotificationName; }
+ std::string& getTitle() { return mTitle; }
+ std::string& getNotificationName() { return mNotificationName; }
// handlers
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);