Pulled llnotifications.h dependency from LLFloater. llnotifications.h includes llevents.h, which can cause conflicts with llevent.h (Legacy events vs non-legacy)
This commit is contained in:
@@ -58,6 +58,7 @@
|
||||
#include "v2math.h"
|
||||
#include "llfasttimer.h"
|
||||
#include "airecursive.h"
|
||||
#include "llnotifications.h"
|
||||
|
||||
const S32 MINIMIZED_WIDTH = 160;
|
||||
const S32 CLOSE_BOX_FROM_TOP = 1;
|
||||
@@ -1410,6 +1411,10 @@ void LLFloater::closeFocusedFloater()
|
||||
}
|
||||
}
|
||||
|
||||
LLNotificationPtr LLFloater::addContextualNotification(const std::string& name, const LLSD& substitutions)
|
||||
{
|
||||
return LLNotifications::instance().add(LLNotification::Params(name).context(mNotificationContext).substitutions(substitutions));
|
||||
}
|
||||
|
||||
void LLFloater::onClickClose()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user