diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-11-13 17:52:57 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-11-13 17:52:57 +0200 |
| commit | 806edae08493b746edc46f3def332030f69a02df (patch) | |
| tree | 4aaf286add7d3d5c31601b3967328461cdab130c | |
| parent | 977b731dd6cb5ce0ef754633a2c95130ee016ee4 (diff) | |
Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Improved functionality to process Buttons showing via context menu
- added new alert dialog ("BottomTrayButtonCanNotBeShown") in case when there is no enough space to show button
For now it contains a such message:
"Selected button can not be shown right now.
The button will be shown when there is enough space for it."
It should be reviewed by XUI team
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index c0ab0b27e5..dd06959472 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -761,6 +761,7 @@ void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type { // mark this button to show it while future bottom tray extending mResizeState |= shown_object_type; + LLNotifications::instance().add("BottomTrayButtonCanNotBeShown"); } } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ff0cd7ffeb..194378ea94 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5739,6 +5739,15 @@ Are you sure you want to delete your teleport history? yestext="OK"/> </notification> + <notification + icon="alert.tga" + name="BottomTrayButtonCanNotBeShown" + type="alert"> +Selected button can not be shown right now. +The button will be shown when there is enough space for it.
+ </notification> + + <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. </global> |