CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:

LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler

1 files changed, 0 insertions, 125 deletions

diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h
deleted file mode 100644
index c6a2637e8f..0000000000
--- a/indra/newview/llnearbychat.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/** 
- * @file llnearbychat.h
- * @brief LLNearbyChat class definition
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLNEARBYCHAT_H
-#define LL_LLNEARBYCHAT_H
-
-#include "llimconversation.h"
-#include "llcombobox.h"
-#include "llgesturemgr.h"
-#include "llchat.h"
-#include "llvoiceclient.h"
-#include "lloutputmonitorctrl.h"
-#include "llspeakers.h"
-#include "llscrollbar.h"
-#include "llviewerchat.h"
-#include "llpanel.h"
-
-class LLResizeBar;
-
-class LLNearbyChat
-	:	public LLIMConversation
-{
-public:
-	// constructor for inline chat-bars (e.g. hosted in chat history window)
-	LLNearbyChat(const LLSD& key = LLSD(LLUUID()));
-	~LLNearbyChat() {}
-
-	static LLNearbyChat* buildFloater(const LLSD& key);
-
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ void onClose(bool app_quitting);
-	/*virtual*/ void setVisible(BOOL visible);
-
-	void loadHistory();
-    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();
-
-	static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate);
-	static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate);
-
-	static bool isWordsName(const std::string& name);
-
-	void showHistory();
-
-protected:
-	static BOOL matchChatTypeTrigger(const std::string& in_str, std::string* out_str);
-	static void onChatBoxKeystroke(LLTextEditor* caller, void* userdata);
-	static void onChatBoxFocusLost(LLFocusableElement* caller, void* userdata);
-	void onChatBoxFocusReceived();
-
-	void sendChat( EChatType type );
-	void onChatBoxCommit();
-	void onChatFontChange(LLFontGL* fontp);
-
-	/*virtual*/ void onTearOffClicked();
-	/*virtual*/ void onClickCloseBtn();
-
-	static LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
-	EChatType processChatTypeTriggers(EChatType type, std::string &str);
-
-	void displaySpeakingIndicator();
-
-	// Which non-zero channel did we last chat on?
-	static S32 sLastSpecialChatChannel;
-
-	LLOutputMonitorCtrl*	mOutputMonitor;
-	LLLocalSpeakerMgr*		mSpeakerMgr;
-
-	S32 mExpandedHeight;
-
-private:
-
-	void	onNearbySpeakers	();
-
-	/*virtual*/ void refresh();
-
-	LLHandle<LLView>	mPopupMenuHandle;
-	std::vector<LLChat> mMessageArchive;
-
-};
-
-#endif