Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SV-2093: Add Block option to ScriptDialogs.

Browse Source 
Thanks to routergray for helping me test this.
This commit is contained in:
Lirusaito
2016-06-28 10:33:48 -04:00
parent e11b70415d
commit 086af65f89
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewermessage.cpp
View File

@@ -8090,8 +8090,8 @@ bool callback_script_dialog(const LLSD& notification, const LLSD& response)
std::string button = LLNotification::getSelectedOptionName(response);
S32 button_idx = LLNotification::getSelectedOption(notification, response);
// Didn't click "Ignore"
if (button_idx != -1)
// Didn't click "Ignore" or "Block"
if (button_idx > -1)
{
if (notification["payload"].has("textbox"))
{
@@ -8109,6 +8109,10 @@ bool callback_script_dialog(const LLSD& notification, const LLSD& response)
msg->addString("ButtonLabel", button);
msg->sendReliable(LLHost(notification["payload"]["sender"].asString()));
}
else if (button_idx == -2) // Block
{
LLMuteList::getInstance()->add(LLMute(notification["payload"]["object_id"].asUUID(), notification["substitutions"]["TITLE"].asString(), LLMute::OBJECT));
}
return false;
}