diff options
author | Samuel Kolb <skolb@lindenlab.com> | 2009-11-30 09:11:04 -0800 |
---|---|---|
committer | Samuel Kolb <skolb@lindenlab.com> | 2009-11-30 09:11:04 -0800 |
commit | e2699c64a20262f6fbe6c1432294e8428e8cda5d (patch) | |
tree | 5b14a249342021b220df723a91c3e78d2c91f06e /indra/newview/llbottomtray.cpp | |
parent | 6824800fa0001cd4a23a4f98b099af34435b0e06 (diff) | |
parent | d4e01315e3f39dd14bb2c14f09e4e94749542b06 (diff) |
merge viewer-2-0 into media
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"); } } |