diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-01-25 23:30:20 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-01-25 23:30:20 +0200 |
| commit | 1f542bf5427787577a564cd716b005c19500d54a (patch) | |
| tree | d0db220565b45405d5c029e32e6135ac67a40a65 /indra | |
| parent | 3e1a4ac54888a0082f0276ad62f5b2133baa2b2f (diff) | |
SL-3007 mac build fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterreporter.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterreporter.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index dffd523b02..f286e4c075 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -406,7 +406,8 @@ public: } else if (level == "report_abuse") { - LLFloaterReporter::showFromChat(mAvatarID, mFrom, getChild<LLTextBox>("time_box")->getValue().asString(), mText); + std::string time = getChild<LLTextBox>("time_box")->getValue().asString(); + LLFloaterReporter::showFromChat(mAvatarID, mFrom, time, mText); } else if(level == "block_unblock") { diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 5b5af06e60..1c10bf3ca3 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -660,7 +660,7 @@ void LLFloaterReporter::showFromAvatar(const LLUUID& avatar_id, const std::strin } // static -void LLFloaterReporter::showFromChat(const LLUUID& avatar_id, const std::string& avatar_name, std::string& time, std::string& description) +void LLFloaterReporter::showFromChat(const LLUUID& avatar_id, const std::string& avatar_name, const std::string& time, const std::string& description) { show(avatar_id, avatar_name); setDescription(time + "\n" + description); diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h index 14ba4d6c58..50a7fcaff3 100644 --- a/indra/newview/llfloaterreporter.h +++ b/indra/newview/llfloaterreporter.h @@ -93,7 +93,7 @@ public: static void showFromObject(const LLUUID& object_id, const LLUUID& experience_id = LLUUID::null); static void showFromAvatar(const LLUUID& avatar_id, const std::string avatar_name); - static void showFromChat(const LLUUID& avatar_id, const std::string& avatar_name, std::string& time, std::string& description); + static void showFromChat(const LLUUID& avatar_id, const std::string& avatar_name, const std::string& time, const std::string& description); static void showFromExperience(const LLUUID& experience_id); static void onClickSend (void *userdata); |