livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-3007 mac build fix

master
Andrey Kleshchev 2022-01-25 23:30:20 +02:00
parent 3e1a4ac548
commit 1f542bf542
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llchathistory.cpp
View File

@ -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")
{

2
indra/newview/llfloaterreporter.cpp
View File

@ -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);

2
indra/newview/llfloaterreporter.h
View File

@ -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);