Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mFocusLostSignal is not needed, these disconnect themselves.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-02-11 01:44:26 -05:00
parent fd9166e32a
commit 5279697890
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llimpanel.cpp
View File

@@ -444,9 +444,6 @@ LLFloaterIMPanel::~LLFloaterIMPanel()
delete mVoiceChannel; delete mVoiceChannel;
mVoiceChannel = NULL; mVoiceChannel = NULL;
//delete focus lost callback
mFocusLostSignal.disconnect();
} }
// virtual // virtual
@@ -484,7 +481,7 @@ BOOL LLFloaterIMPanel::postBuild()
mInputEditor = getChild<LLLineEditor>("chat_editor"); mInputEditor = getChild<LLLineEditor>("chat_editor");
mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5)); mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5));
mInputEditor->setFocusReceivedCallback( boost::bind(&LLFloaterIMPanel::onInputEditorFocusReceived, this) ); 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->setKeystrokeCallback( boost::bind(&LLFloaterIMPanel::onInputEditorKeystroke, this, _1) );
mInputEditor->setCommitCallback( boost::bind(&LLFloaterIMPanel::onSendMsg,this) ); mInputEditor->setCommitCallback( boost::bind(&LLFloaterIMPanel::onSendMsg,this) );
mInputEditor->setCommitOnFocusLost( FALSE ); mInputEditor->setCommitOnFocusLost( FALSE );

3
indra/newview/llimpanel.h
View File

@@ -242,9 +242,6 @@ private:
// Timer to detect when user has stopped typing. // Timer to detect when user has stopped typing.
LLFrameTimer mLastKeystrokeTimer; LLFrameTimer mLastKeystrokeTimer;
boost::signals2::connection mFocusLostSignal;
CachedUICtrl<LLUICtrl> mVolumeSlider; CachedUICtrl<LLUICtrl> mVolumeSlider;
CachedUICtrl<LLUICtrl> mEndCallBtn; CachedUICtrl<LLUICtrl> mEndCallBtn;
CachedUICtrl<LLUICtrl> mStartCallBtn; CachedUICtrl<LLUICtrl> mStartCallBtn;