merge

1 files changed, 5 insertions, 10 deletions

diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
index 2ea79797f8..5ef584c8ff 100644
--- a/indra/newview/llnearbychat.h
+++ b/indra/newview/llnearbychat.h
@@ -1,4 +1,4 @@
-/** 
+ /** 
  * @file llnearbychat.h
  * @brief nearby chat history scrolling panel implementation
  *
@@ -27,17 +27,17 @@
 #ifndef LL_LLNEARBYCHAT_H_
 #define LL_LLNEARBYCHAT_H_
 
-#include "lldockablefloater.h"
 #include "llscrollbar.h"
 #include "llviewerchat.h"
+#include "llfloater.h"
 
 class LLResizeBar;
 class LLChatHistory;
 
-class LLNearbyChat: public LLDockableFloater
+class LLNearbyChat: public LLPanel
 {
 public:
-	LLNearbyChat(const LLSD& key);
+	LLNearbyChat();
 	~LLNearbyChat();
 
 	BOOL	postBuild			();
@@ -54,12 +54,8 @@ public:
 	/*virtual*/ void	onFocusLost();
 	/*virtual*/ void	onFocusReceived();
 	
-	/*virtual*/ void	onOpen	(const LLSD& key);
-
 	/*virtual*/ void	setVisible(BOOL visible);
-
-	virtual void setRect		(const LLRect &rect);
-
+	
 	virtual void updateChatHistoryStyle();
 
 	static void processChatHistoryStyleUpdate(const LLSD& newvalue);
@@ -69,7 +65,6 @@ public:
 	static LLNearbyChat* getInstance();
 
 private:
-	virtual void    applySavedVariables();
 
 	void	getAllowedRect		(LLRect& rect);