From 9f3c4e909ac61ad34afac3efa45d96145b6fb112 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 23 Jun 2013 19:01:39 -0400 Subject: [PATCH] Removed the need for LLPanelAvatarNotes::onCommitNotes with a bind --- indra/newview/llpanelavatar.cpp | 10 +--------- indra/newview/llpanelavatar.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index bd0f62603..d375b1dc1 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -546,7 +546,7 @@ BOOL LLPanelAvatarFirstLife::postBuild(void) BOOL LLPanelAvatarNotes::postBuild(void) { - childSetCommitCallback("notes edit",onCommitNotes,this); + getChild("notes edit")->setCommitCallback(boost::bind(&LLPanelAvatar::sendAvatarNotesUpdate, getPanelAvatar())); LLTextEditor* te = getChild("notes edit"); if(te) te->setCommitOnFocusLost(TRUE); @@ -897,14 +897,6 @@ void LLPanelAvatarNotes::clearControls() childSetEnabled("notes edit", false); } -// static -void LLPanelAvatarNotes::onCommitNotes(LLUICtrl*, void* userdata) -{ - LLPanelAvatarNotes* self = (LLPanelAvatarNotes*)userdata; - - self->getPanelAvatar()->sendAvatarNotesUpdate(); -} - //----------------------------------------------------------------------------- // LLPanelAvatarClassified() diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h index d43746308..ef9841992 100644 --- a/indra/newview/llpanelavatar.h +++ b/indra/newview/llpanelavatar.h @@ -216,8 +216,6 @@ public: /*virtual*/ void processProperties(void* data, EAvatarProcessorType type){} void clearControls(); - - static void onCommitNotes(LLUICtrl* field, void* userdata); };