Fixed critical bug EXT-4419 ([BSI] pressing enter without local chat selected causes warning flood)
--HG-- branch : product-enginemeow-7.2.2
parent
5b44c7c624
commit
88d9710a8c
|
|
@ -48,6 +48,7 @@
|
|||
#include "llsyswellwindow.h"
|
||||
#include "llfloatercamera.h"
|
||||
#include "lltexteditor.h"
|
||||
#include "llnotifications.h"
|
||||
|
||||
// Build time optimization, generate extern template once in .cpp file
|
||||
template class LLBottomTray* LLSingleton<class LLBottomTray>::getInstance();
|
||||
|
|
@ -1106,7 +1107,10 @@ void LLBottomTray::setTrayButtonVisibleIfPossible(EResizeState shown_object_type
|
|||
// mark this button to show it while future bottom tray extending
|
||||
mResizeState |= shown_object_type;
|
||||
if ( raise_notification )
|
||||
LLNotificationsUtil::add("BottomTrayButtonCanNotBeShown");
|
||||
LLNotificationsUtil::add("BottomTrayButtonCanNotBeShown",
|
||||
LLSD(),
|
||||
LLSD(),
|
||||
LLNotificationFunctorRegistry::instance().DONOTHING);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
|
||||
<button
|
||||
name="Alert Button"
|
||||
label_shadow="true"
|
||||
auto_resize="false"
|
||||
image_overlay_alignment="center"
|
||||
|
|
|
|||
Loading…
Reference in New Issue