From 1f542bf5427787577a564cd716b005c19500d54a Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 25 Jan 2022 23:30:20 +0200
Subject: [PATCH] SL-3007 mac build fix
---
indra/newview/llchathistory.cpp | 3 ++-
indra/newview/llfloaterreporter.cpp | 2 +-
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 dffd523b02b..f286e4c0758 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -406,7 +406,8 @@ class LLChatHistoryHeader: public LLPanel
}
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 5b5af06e601..1c10bf3ca34 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 14ba4d6c587..50a7fcaff39 100644
--- a/indra/newview/llfloaterreporter.h
+++ b/indra/newview/llfloaterreporter.h
@@ -93,7 +93,7 @@ class LLFloaterReporter
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);
--
GitLab