summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychat.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-10-11 18:14:37 +0200
committerPaul ProductEngine <pguslisty@productengine.com>2011-10-11 18:14:37 +0200
commit8154c245dd2f7aaee390e0206f460b9dd5b9f693 (patch)
treeeb781b36ba45780c13a71dfdb049fc232d96a99f /indra/newview/llnearbychat.cpp
parentc845925eebb5cad3049ee0f3b1d0adea3e3a46b5 (diff)
EXP-1281 FIXED (As a FUI user, I want all bottom bar floaters to become independent)
Made bottom bar dependent floaters independent from it. Also some LLTransientDockableFloaters are just LLFLoaters now. Note: IM Floater and SysWellWindow will be made independent within EXP-1276
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
-rw-r--r--indra/newview/llnearbychat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 9eaa64a124..67d745248f 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -34,6 +34,7 @@
#include "lliconctrl.h"
#include "llfloatersidepanelcontainer.h"
#include "llfocusmgr.h"
+#include "lllogchat.h"
#include "llresizebar.h"
#include "llresizehandle.h"
#include "llmenugl.h"
@@ -50,7 +51,6 @@
#include "lldraghandle.h"
-#include "llbottomtray.h"
#include "llnearbychatbar.h"
#include "llfloaterreg.h"
#include "lltrans.h"