2 files changed, 3 insertions, 79 deletions

diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 7002342c0b..a20fce876c 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -95,7 +95,6 @@ LLFloaterIMNearbyChat::LLFloaterIMNearbyChat(const LLSD& llsd)
 {
     mIsP2PChat = false;
 	mIsNearbyChat = true;
-	setIsChrome(TRUE);
 	mSpeakerMgr = LLLocalSpeakerMgr::getInstance();
 	mSessionID = LLUUID();
 }
@@ -119,29 +118,10 @@ BOOL LLFloaterIMNearbyChat::postBuild()
 	mInputEditor->setFocusReceivedCallback(boost::bind(&LLFloaterIMNearbyChat::onChatBoxFocusReceived, this));
 	mInputEditor->setLabel(LLTrans::getString("NearbyChatTitle"));
 
-//	mOutputMonitor = getChild<LLOutputMonitorCtrl>("chat_zone_indicator");
-//	mOutputMonitor->setVisible(FALSE);
-
-	// Register for font change notifications
-//	LLViewerChat::setFontChangedCallback(boost::bind(&LLFloaterIMNearbyChat::onChatFontChange, this, _1));
-
-	// title must be defined BEFORE call addConversationListItem() because
-	// it is used for show the item's name in the conversations list
+	// Title must be defined BEFORE call to addConversationListItem() because
+	// it is used to show the item's name in the conversations list
 	setTitle(LLTrans::getString("NearbyChatTitle"));
 
-	//for menu
-//	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
-//	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
-
-//	enable_registrar.add("NearbyChat.Check", boost::bind(&LLFloaterIMNearbyChat::onNearbyChatCheckContextMenuItem, this, _2));
-//	registrar.add("NearbyChat.Action", boost::bind(&LLFloaterIMNearbyChat::onNearbyChatContextMenuItemClicked, this, _2));
-
-//	LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_nearby_chat.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-//	if(menu)
-//	{
-//		mPopupMenuHandle = menu->getHandle();
-//	}
-
 	// obsolete, but may be needed for backward compatibility?
 	gSavedSettings.declareS32("nearbychat_showicons_and_names", 2, "NearByChat header settings", true);
 
@@ -168,43 +148,6 @@ void LLFloaterIMNearbyChat::refresh()
 	}
 }
 
-void LLFloaterIMNearbyChat::onNearbySpeakers()
-{
-	LLSD param;
-	param["people_panel_tab_name"] = "nearby_panel";
-	LLFloaterSidePanelContainer::showPanel("people", "panel_people", param);
-}
-
-void	LLFloaterIMNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)
-{
-}
-
-bool	LLFloaterIMNearbyChat::onNearbyChatCheckContextMenuItem(const LLSD& userdata)
-{
-	std::string str = userdata.asString();
-	if(str == "nearby_people")
-		onNearbySpeakers();
-	return false;
-}
-
-
-BOOL	LLFloaterIMNearbyChat::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	//fix for EXT-6625
-	//highlight NearbyChat history whenever mouseclick happen in NearbyChat
-	//setting focus to eidtor will force onFocusLost() call that in its turn will change
-	//background opaque. This all happenn since NearByChat is "chrome" and didn't process focus change.
-
-	if(mChatHistory)
-	{
-		mChatHistory->setFocus(TRUE);
-	}
-
-	BOOL handled = LLPanel::handleMouseDown(x, y, mask);
-	setFocus(handled);
-	return handled;
-}
-
 void LLFloaterIMNearbyChat::reloadMessages()
 {
 	mChatHistory->clear();
@@ -629,7 +572,7 @@ void LLFloaterIMNearbyChat::displaySpeakingIndicator()
 	LLUUID id;
 
 	id.setNull();
-	mSpeakerMgr->update(TRUE);
+	mSpeakerMgr->update(FALSE);
 	mSpeakerMgr->getSpeakerList(&speaker_list, FALSE);
 
 	for (LLSpeakerMgr::speaker_list_t::iterator i = speaker_list.begin(); i != speaker_list.end(); ++i)
@@ -641,16 +584,6 @@ void LLFloaterIMNearbyChat::displaySpeakingIndicator()
 			break;
 		}
 	}
-
-	if (!id.isNull())
-	{
-		//mOutputMonitor->setVisible(TRUE);
-		//mOutputMonitor->setSpeakerId(id);
-	}
-	else
-	{
-		//mOutputMonitor->setVisible(FALSE);
-	}
 }
 
 void LLFloaterIMNearbyChat::sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate)
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h
index 5ed639136b..a38824dc78 100644
--- a/indra/newview/llfloaterimnearbychat.h
+++ b/indra/newview/llfloaterimnearbychat.h
@@ -59,21 +59,17 @@ public:
     void reloadMessages();
 	void removeScreenChat();
 
-	void addToHost();
 	void show();
 	bool isChatVisible() const;
 
 	/** @param archive true - to save a message to the chat history log */
 	void	addMessage			(const LLChat& message,bool archive = true, const LLSD &args = LLSD());
-	void	onNearbyChatContextMenuItemClicked(const LLSD& userdata);
-	bool	onNearbyChatCheckContextMenuItem(const LLSD& userdata);
 
 	LLChatEntry* getChatBox() { return mInputEditor; }
 
 	std::string getCurrentChat();
 
 	virtual BOOL handleKeyHere( KEY key, MASK mask );
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 
 	static void startChat(const char* line);
 	static void stopChat();
@@ -112,14 +108,9 @@ protected:
 	S32 mExpandedHeight;
 
 private:
-
-	void	onNearbySpeakers	();
-
 	/*virtual*/ void refresh();
 
-//	LLHandle<LLView>	mPopupMenuHandle;
 	std::vector<LLChat> mMessageArchive;
-
 };
 
 #endif // LL_LLFLOATERIMNEARBYCHAT_H