diff options
author | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-16 22:10:30 -0700 |
commit | 83bb4b9518da813a42e49366cea15e5ae9dc7507 (patch) | |
tree | 395372dc049dc2ea06dcd977a8b71befbda37fe0 /indra/newview/llnotificationtiphandler.cpp | |
parent | 1911993cc7761216c70b95e77b49da383c9e162d (diff) |
fixed merge
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
-rw-r--r-- | indra/newview/llnotificationtiphandler.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 94612975a2..3c1cd107df 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" // must be first include +#include "llchannelmanager.h" +#include "llinstantmessage.h" #include "llfloaterreg.h" #include "llnearbychat.h" #include "llnotificationhandler.h" @@ -36,6 +38,7 @@ #include "llviewerwindow.h" #include "llnotificationmanager.h" #include "llpaneltiptoast.h" +#include "lltoast.h" using namespace LLNotificationsUI; |