From 527969789048930cac183fc35ea1b69e3d147e6f Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Wed, 11 Feb 2015 01:44:26 -0500 Subject: [PATCH] mFocusLostSignal is not needed, these disconnect themselves. --- indra/newview/llimpanel.cpp | 5 +---- indra/newview/llimpanel.h | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index b55c0e9e4..9ce08dfa0 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -444,9 +444,6 @@ LLFloaterIMPanel::~LLFloaterIMPanel() delete mVoiceChannel; mVoiceChannel = NULL; - - //delete focus lost callback - mFocusLostSignal.disconnect(); } // virtual @@ -484,7 +481,7 @@ BOOL LLFloaterIMPanel::postBuild() mInputEditor = getChild("chat_editor"); mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5)); mInputEditor->setFocusReceivedCallback( boost::bind(&LLFloaterIMPanel::onInputEditorFocusReceived, this) ); - mFocusLostSignal = mInputEditor->setFocusLostCallback(boost::bind(&LLFloaterIMPanel::setTyping, this, false)); + mInputEditor->setFocusLostCallback(boost::bind(&LLFloaterIMPanel::setTyping, this, false)); mInputEditor->setKeystrokeCallback( boost::bind(&LLFloaterIMPanel::onInputEditorKeystroke, this, _1) ); mInputEditor->setCommitCallback( boost::bind(&LLFloaterIMPanel::onSendMsg,this) ); mInputEditor->setCommitOnFocusLost( FALSE ); diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index 463df3147..a1285dbe9 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -242,9 +242,6 @@ private: // Timer to detect when user has stopped typing. LLFrameTimer mLastKeystrokeTimer; - boost::signals2::connection mFocusLostSignal; - - CachedUICtrl mVolumeSlider; CachedUICtrl mEndCallBtn; CachedUICtrl mStartCallBtn;