diff options
| author | Richard Linden <none@none> | 2010-09-17 15:02:39 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-17 15:02:39 -0700 |
| commit | e794421e44c2f59f96249dd215af8373d557b3df (patch) | |
| tree | 9e8124ae3e15e790b6524f172a1f233c2bccd53d /indra/newview/llnearbychathandler.cpp | |
| parent | a98ac26bd607ad17bbea041d50b1fac9ddc24b61 (diff) | |
| parent | 949b60465593764118c03d0f4e112f69c41bab31 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 83777af31a..303f2abcce 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -28,7 +28,7 @@ #include "llagentdata.h" // for gAgentID #include "llnearbychathandler.h" -#include "llchannelmanager.h" + #include "llbottomtray.h" #include "llchatitemscontainerctrl.h" #include "llfirstuse.h" @@ -36,7 +36,6 @@ #include "llhints.h" #include "llnearbychat.h" #include "llrecentpeople.h" -#include "llscreenchannel.h" #include "llviewercontrol.h" |