diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-26 17:46:17 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-26 17:46:17 +0200 |
| commit | 81fdca151fa38494992115bfea219c7f9c6baf1e (patch) | |
| tree | 2ddc11a57ccdba3be2798456c62ea6f3a42c02fe /indra/newview/llbottomtray.cpp | |
| parent | 8a812495daa52aa9ae092222c23c5f8815929544 (diff) | |
| parent | 82575515e0614552548bd3f45cea558772bb032f (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index c4f0fa53a7..9cc7b8c785 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -40,6 +40,7 @@ #include "llimfloater.h" // for LLIMFloater #include "lllayoutstack.h" #include "llnearbychatbar.h" +#include "llnotificationsutil.h" #include "llspeakbutton.h" #include "llsplitbutton.h" #include "llsyswellwindow.h" @@ -941,7 +942,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"); + LLNotificationsUtil::add("BottomTrayButtonCanNotBeShown"); } } |