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

Removed setCallbackUserData calls from the last few newview files

Browse Source
This commit is contained in:
Lirusaito
2013-06-25 23:54:09 -04:00
parent 8fb8e74e54
commit 5aaea47a81
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloatermediabrowser.cpp
View File

@@ -127,8 +127,7 @@ BOOL LLFloaterMediaBrowser::postBuild()
mBrowser->addObserver(this); mBrowser->addObserver(this);
mAddressCombo = getChild<LLComboBox>("address"); mAddressCombo = getChild<LLComboBox>("address");
mAddressCombo->setCommitCallback(onEnterAddress); mAddressCombo->setCommitCallback(onEnterAddress, this);
mAddressCombo->setCallbackUserData(this);
mAddressCombo->sortByName(); mAddressCombo->sortByName();
childSetAction("back", onClickBack, this); childSetAction("back", onClickBack, this);

6
indra/newview/llfloatertopobjects.cpp
View File

@@ -126,16 +126,14 @@ BOOL LLFloaterTopObjects::postBuild()
if (line_editor) if (line_editor)
{ {
line_editor->setCommitOnFocusLost(FALSE); line_editor->setCommitOnFocusLost(FALSE);
line_editor->setCommitCallback(onGetByOwnerName); line_editor->setCommitCallback(onGetByOwnerName, this);
line_editor->setCallbackUserData(this);
} }
line_editor = getChild<LLLineEditor>("object_name_editor"); line_editor = getChild<LLLineEditor>("object_name_editor");
if (line_editor) if (line_editor)
{ {
line_editor->setCommitOnFocusLost(FALSE); line_editor->setCommitOnFocusLost(FALSE);
line_editor->setCommitCallback(onGetByObjectName); line_editor->setCommitCallback(onGetByObjectName, this);
line_editor->setCallbackUserData(this);
}*/ }*/
mCurrentMode = STAT_REPORT_TOP_SCRIPTS; mCurrentMode = STAT_REPORT_TOP_SCRIPTS;

3
indra/newview/llpanellandmedia.cpp
View File

@@ -88,8 +88,7 @@ BOOL LLPanelLandMedia::postBuild()
{ {
mMediaTextureCtrl = getChild<LLTextureCtrl>("media texture"); mMediaTextureCtrl = getChild<LLTextureCtrl>("media texture");
mMediaTextureCtrl->setCommitCallback( onCommitAny ); mMediaTextureCtrl->setCommitCallback( onCommitAny, this );
mMediaTextureCtrl->setCallbackUserData( this );
mMediaTextureCtrl->setAllowNoTexture ( TRUE ); mMediaTextureCtrl->setAllowNoTexture ( TRUE );
mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER); mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);

10
indra/newview/llpreviewgesture.cpp
View File

@@ -414,7 +414,6 @@ BOOL LLPreviewGesture::postBuild()
edit->setKeystrokeCallback(boost::bind(&onKeystrokeCommit,_1,this)); edit->setKeystrokeCallback(boost::bind(&onKeystrokeCommit,_1,this));
edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitSetDirty,this)); edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitSetDirty,this));
edit->setCommitOnFocusLost(TRUE); edit->setCommitOnFocusLost(TRUE);
edit->setIgnoreTab(TRUE); edit->setIgnoreTab(TRUE);
mReplaceEditor = edit; mReplaceEditor = edit;
@@ -479,10 +478,8 @@ BOOL LLPreviewGesture::postBuild()
edit = getChild<LLLineEditor>("chat_editor"); edit = getChild<LLLineEditor>("chat_editor");
edit->setVisible(FALSE); edit->setVisible(FALSE);
edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitChat,this)); edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitChat,this));
//edit->setKeystrokeCallback(onKeystrokeCommit); //edit->setKeystrokeCallback(onKeystrokeCommit, this);
//edit->setCallbackUserData(this);
edit->setCommitOnFocusLost(TRUE); edit->setCommitOnFocusLost(TRUE);
edit->setIgnoreTab(TRUE); edit->setIgnoreTab(TRUE);
mChatEditor = edit; mChatEditor = edit;
@@ -500,11 +497,9 @@ BOOL LLPreviewGesture::postBuild()
edit->setEnabled(FALSE); edit->setEnabled(FALSE);
edit->setVisible(FALSE); edit->setVisible(FALSE);
edit->setPrevalidate(LLLineEditor::prevalidateFloat); edit->setPrevalidate(LLLineEditor::prevalidateFloat);
// edit->setKeystrokeCallback(onKeystrokeCommit); // edit->setKeystrokeCallback(onKeystrokeCommit, this);
//edit->setCallbackUserData(this);
edit->setCommitOnFocusLost(TRUE); edit->setCommitOnFocusLost(TRUE);
edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitWaitTime,this)); edit->setCommitCallback(boost::bind(&LLPreviewGesture::onCommitWaitTime,this));
edit->setIgnoreTab(TRUE); edit->setIgnoreTab(TRUE);
mWaitTimeEditor = edit; mWaitTimeEditor = edit;
@@ -528,7 +523,6 @@ BOOL LLPreviewGesture::postBuild()
addAnimations(); addAnimations();
addSounds(); addSounds();
const LLInventoryItem* item = getItem(); const LLInventoryItem* item = getItem();
if (item) if (item)