diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-02 09:56:11 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-02 09:56:11 -0400 |
| commit | e66817e6d7e493bb5c3eccc64bcfb6be2f66f068 (patch) | |
| tree | 87a4c07bcf4296f1b46e73ae0043ad733c7409e9 | |
| parent | 2dffe303ebd3ce9ddfef822c94ee6cd187029d6f (diff) | |
| parent | 129a522235e0be1d22d94abec43ba1ca3cfe8b0b (diff) | |
merge changes for storm-1822
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f157a1e7fa..8ca25a5ac6 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -611,6 +611,7 @@ Jonathan Yap STORM-1799 STORM-1796 STORM-637 + STORM-1822 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index de305bf3d9..a8060649ba 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; |