From 5aaea47a818ed8768240c9774054eb48d24a855e Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 25 Jun 2013 23:54:09 -0400 Subject: [PATCH] Removed setCallbackUserData calls from the last few newview files --- indra/newview/llfloatermediabrowser.cpp | 3 +-- indra/newview/llfloatertopobjects.cpp | 6 ++---- indra/newview/llpanellandmedia.cpp | 3 +-- indra/newview/llpreviewgesture.cpp | 10 ++-------- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/indra/newview/llfloatermediabrowser.cpp b/indra/newview/llfloatermediabrowser.cpp index 43abcb8c0..62fa849dd 100644 --- a/indra/newview/llfloatermediabrowser.cpp +++ b/indra/newview/llfloatermediabrowser.cpp @@ -127,8 +127,7 @@ BOOL LLFloaterMediaBrowser::postBuild() mBrowser->addObserver(this); mAddressCombo = getChild("address"); - mAddressCombo->setCommitCallback(onEnterAddress); - mAddressCombo->setCallbackUserData(this); + mAddressCombo->setCommitCallback(onEnterAddress, this); mAddressCombo->sortByName(); childSetAction("back", onClickBack, this); diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 46757f75b..6b181433d 100644 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -126,16 +126,14 @@ BOOL LLFloaterTopObjects::postBuild() if (line_editor) { line_editor->setCommitOnFocusLost(FALSE); - line_editor->setCommitCallback(onGetByOwnerName); - line_editor->setCallbackUserData(this); + line_editor->setCommitCallback(onGetByOwnerName, this); } line_editor = getChild("object_name_editor"); if (line_editor) { line_editor->setCommitOnFocusLost(FALSE); - line_editor->setCommitCallback(onGetByObjectName); - line_editor->setCallbackUserData(this); + line_editor->setCommitCallback(onGetByObjectName, this); }*/ mCurrentMode = STAT_REPORT_TOP_SCRIPTS; diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp index e49e849a0..152d1786f 100644 --- a/indra/newview/llpanellandmedia.cpp +++ b/indra/newview/llpanellandmedia.cpp @@ -88,8 +88,7 @@ BOOL LLPanelLandMedia::postBuild() { mMediaTextureCtrl = getChild("media texture"); - mMediaTextureCtrl->setCommitCallback( onCommitAny ); - mMediaTextureCtrl->setCallbackUserData( this ); + mMediaTextureCtrl->setCommitCallback( onCommitAny, this ); mMediaTextureCtrl->setAllowNoTexture ( TRUE ); mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index c31f53538..c5ffefffe 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -414,7 +414,6 @@ BOOL LLPreviewGesture::postBuild() edit->setKeystrokeCallback(boost::bind(&onKeystrokeCommit,_1,this)); edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitSetDirty,this)); edit->setCommitOnFocusLost(TRUE); - edit->setIgnoreTab(TRUE); mReplaceEditor = edit; @@ -479,10 +478,8 @@ BOOL LLPreviewGesture::postBuild() edit = getChild("chat_editor"); edit->setVisible(FALSE); edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitChat,this)); - //edit->setKeystrokeCallback(onKeystrokeCommit); - //edit->setCallbackUserData(this); + //edit->setKeystrokeCallback(onKeystrokeCommit, this); edit->setCommitOnFocusLost(TRUE); - edit->setIgnoreTab(TRUE); mChatEditor = edit; @@ -500,11 +497,9 @@ BOOL LLPreviewGesture::postBuild() edit->setEnabled(FALSE); edit->setVisible(FALSE); edit->setPrevalidate(LLLineEditor::prevalidateFloat); -// edit->setKeystrokeCallback(onKeystrokeCommit); - //edit->setCallbackUserData(this); +// edit->setKeystrokeCallback(onKeystrokeCommit, this); edit->setCommitOnFocusLost(TRUE); edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitWaitTime,this)); - edit->setIgnoreTab(TRUE); mWaitTimeEditor = edit; @@ -528,7 +523,6 @@ BOOL LLPreviewGesture::postBuild() addAnimations(); addSounds(); - const LLInventoryItem* item = getItem(); if (item)