summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychat.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llnearbychat.h')
-rw-r--r--indra/newview/llnearbychat.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index cb4654654a..561c2d3677 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -35,7 +35,7 @@
#include "lldockablefloater.h"
#include "llscrollbar.h"
-#include "llchat.h"
+#include "llviewerchat.h"
class LLResizeBar;
class LLChatHistory;
@@ -47,13 +47,10 @@ public:
~LLNearbyChat();
BOOL postBuild ();
- void addMessage (const LLChat& message);
-
+ void addMessage (const LLChat& message);
void onNearbyChatContextMenuItemClicked(const LLSD& userdata);
bool onNearbyChatCheckContextMenuItem(const LLSD& userdata);
- void setDocked (bool docked, bool pop_on_undock = true);
-
/*virtual*/ void onOpen (const LLSD& key);
virtual void setRect (const LLRect &rect);
@@ -64,7 +61,6 @@ private:
void getAllowedRect (LLRect& rect);
void onNearbySpeakers ();
- void add_timestamped_line(const LLChat& chat, const LLColor4& color);
private: