Merge branch 'develop-linux' into marchcat/slua-linux

1 files changed, 0 insertions, 44 deletions

diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
deleted file mode 100644
index 07a8641a92..0000000000
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @file llpanelimcontrolpanel.cpp
- * @brief LLPanelIMControlPanel and related class implementations
- *
- * $LicenseInfo:firstyear=2004&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$
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llfloaterreg.h"
-
-#include "llpanelimcontrolpanel.h"
-
-#include "llagent.h"
-#include "llappviewer.h" // for gDisconnected
-#include "llavataractions.h"
-#include "llavatariconctrl.h"
-#include "llbutton.h"
-#include "llgroupactions.h"
-#include "llavatarlist.h"
-#include "llparticipantlist.h"
-#include "llimview.h"
-#include "llspeakers.h"
-#include "lltrans.h"
-
-