From 129a522235e0be1d22d94abec43ba1ca3cfe8b0b Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 22 Mar 2012 12:29:03 -0400
Subject: [PATCH] STORM-1822 Change size of Block button in dialog boxes to
help prevent accidental clicks
---
doc/contributions.txt | 1 +
indra/newview/lltoastnotifypanel.cpp | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c5db396c972..9216e48b854 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -610,6 +610,7 @@ Jonathan Yap
STORM-1788
STORM-1799
STORM-1796
+ STORM-1822
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index de305bf3d9d..a8060649ba6 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -243,8 +243,8 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
mBtnCallbackData.push_back(userdata);
LLButton::Params p;
- bool is_ignore_btn = form_element["index"].asInteger() == -1;
- const LLFontGL* font = is_ignore_btn ? sFontSmall: sFont; // for ignore button in script dialog
+ bool make_small_btn = form_element["index"].asInteger() == -1 || form_element["index"].asInteger() == -2;
+ const LLFontGL* font = make_small_btn ? sFontSmall: sFont; // for block and ignore buttons in script dialog
p.name(form_element["name"].asString());
p.label(form_element["text"].asString());
p.font(font);
@@ -264,7 +264,7 @@ LLButton* LLToastNotifyPanel::createButton(const LLSD& form_element, BOOL is_opt
p.rect.width = 1;
p.auto_resize = true;
}
- else if (mIsScriptDialog && is_ignore_btn)
+ else if (mIsScriptDialog && make_small_btn)
{
// this is ignore button, make it smaller
p.rect.height = BTN_HEIGHT_SMALL;
--
GitLab