diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-04-13 18:26:36 +0300 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-04-13 18:26:36 +0300 |
commit | 3a5ae14b85d0ba8d562cddaa06f6c0bc0dccde33 (patch) | |
tree | e035007c19cb0384ce8f817bb8df39c6046f7105 /indra/newview/llbottomtray.cpp | |
parent | e2d32b9e9d48d0efde92c54c9aaa62fa56671002 (diff) |
Completed normal subtask EXT-6621 (Code cleanup: Remove unused LLFloaterActiveSpeakers and related classes from viewer)
* Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo.
* Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt).
* Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove).
* Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions.
* Also removed old textures related to removed xml and unused in 2.0 anymore.
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-rw-r--r-- | indra/newview/llbottomtray.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 41bee540fc..4ebccbe731 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -185,24 +185,6 @@ LLBottomTray::~LLBottomTray() } } -void LLBottomTray::onChicletClick(LLUICtrl* ctrl) -{ - LLIMChiclet* chiclet = dynamic_cast<LLIMChiclet*>(ctrl); - if (chiclet) - { - // Until you can type into an IM Window and have a conversation, - // still show the old communicate window - //LLFloaterReg::showInstance("communicate", chiclet->getSessionId()); - - // Show after comm window so it is frontmost (and hence will not - // auto-hide) - -// this logic has been moved to LLIMChiclet::handleMouseDown -// LLIMFloater::show(chiclet->getSessionId()); -// chiclet->setCounter(0); - } -} - // *TODO Vadim: why void* ? void* LLBottomTray::createNearbyChatBar(void* userdata) { @@ -499,7 +481,6 @@ BOOL LLBottomTray::postBuild() mNearbyChatBar->getChatBox()->setContextMenu(NULL); mChicletPanel = getChild<LLChicletPanel>("chiclet_list"); - mChicletPanel->setChicletClickedCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1)); initStateProcessedObjectMap(); |