Permalink
Browse files

SV-2093: Add Block option to ScriptDialogs.

Thanks to routergray for helping me test this.
  • Loading branch information...
1 parent e11b704 commit 086af65f89bf9c01b45d5578640e686aa2ea6cde @Lirusaito Lirusaito committed Jun 28, 2016
@@ -390,9 +390,9 @@ LLButton* LLNotifyBox::addButton(const std::string& name, const std::string& lab
if (layout_script_dialog)
{
- // Add two "blank" option spaces, before the "Ignore" button
- index = button_index + 2;
- if (button_index == 0)
+ // Add one "blank" option space, before the "Block" and "Ignore" buttons
+ index = button_index + 1;
+ if (button_index == 0 || button_index == 1)
{
// Ignore button is smaller, less wide
btn_height = BTN_HEIGHT_SMALL;
@@ -625,9 +625,9 @@ LLRect LLNotifyBox::getNotifyRect(S32 num_options, bool layout_script_dialog, bo
if (num_options < 1)
num_options = 1;
- // Add two "blank" option spaces.
+ // Add one "blank" option space.
if (layout_script_dialog)
- num_options += 2;
+ num_options += 1;
S32 additional_lines = (num_options-1) / 3;
@@ -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;
}
@@ -7538,6 +7538,10 @@ Grant this request?
[MESSAGE]
<form name="form">
<button
+ index="-2"
+ name="Block"
+ text="Block"/>
+ <button
index="-1"
name="Ignore"
text="Ignore"/>
@@ -7552,6 +7556,10 @@ Grant this request?
[MESSAGE]
<form name="form">
<button
+ index="-2"
+ name="Block"
+ text="Block"/>
+ <button
index="-1"
name="Ignore"
text="Ignore"/>
@@ -7568,6 +7576,10 @@ Grant this request?
<input name="message">
</input>
<button
+ index="-2"
+ name="Block"
+ text="Block"/>
+ <button
index="-1"
name="Ignore"
text="Ignore"/>

0 comments on commit 086af65

Please sign in to comment.