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/llnearbychathandler.cpp | |
| parent | 1911993cc7761216c70b95e77b49da383c9e162d (diff) | |
fixed merge
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 303f2abcce..83777af31a 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,6 +36,7 @@ #include "llhints.h" #include "llnearbychat.h" #include "llrecentpeople.h" +#include "llscreenchannel.h" #include "llviewercontrol.h" |