diff options
| author | Jonathan Yap <none@none> | 2011-08-26 12:11:57 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-08-26 12:11:57 -0400 |
| commit | 1f486a9515d335e0156b23fa84eeb34cdf57cac1 (patch) | |
| tree | 7dbeb002c54c0f2e749eb352234c0ea761be9c22 /indra | |
| parent | 541e26d947e19cf087e068ab3f1bd46fb1d8fd4f (diff) | |
STORM-1567 Mute button for llDialog popup
Made changes per RB feedback.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltoastnotifypanel.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index ea047a1878..6873cf058a 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -305,7 +305,6 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair S32 left = 0; //reserve place for ignore button S32 bottom_offset = mIsScriptDialog ? (BTN_HEIGHT + IGNORE_BTN_TOP_DELTA + BOTTOM_PAD) : BOTTOM_PAD; - S32 ignore_btn_hoffset = 0; S32 max_width = mControlPanel->getRect().getWidth(); LLButton* ignore_btn = NULL; LLButton* mute_btn = NULL; @@ -346,7 +345,6 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair { ignore_btn_left = max_width - ignore_btn_rect.getWidth() - 2 * HPAD; } - ignore_btn_hoffset = ignore_btn_left; ignore_btn_rect.setOriginAndSize(ignore_btn_left, BOTTOM_PAD,// always move ignore button at the bottom ignore_btn_rect.getWidth(), ignore_btn_rect.getHeight()); ignore_btn->setRect(ignore_btn_rect); @@ -358,6 +356,7 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair { LLRect mute_btn_rect(mute_btn->getRect()); S32 buttons_per_row = max_width / BUTTON_WIDTH; //assume that h_pad far less than BUTTON_WIDTH + // Place mute (Block) button to the left of the ignore button. S32 mute_btn_left = buttons_per_row * BUTTON_WIDTH + (buttons_per_row - 1) * h_pad - mute_btn_rect.getWidth() - ignore_btn_width - (h_pad / 2); if (mute_btn_left + mute_btn_rect.getWidth() > max_width) // make sure that the mute button is in panel { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 43e01a1080..ffc7a2ba55 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6261,6 +6261,10 @@ Grant this request? [MESSAGE] <form name="form"> <button + index="-2" + name="Mute" + text="Block"/> + <button index="-1" name="Ignore" text="Ignore"/> |