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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

Browse Source
This commit is contained in:
Lirusaito
2013-06-23 22:36:55 -04:00
parent 3739639295 7a88b9a8a4
commit 45bbf52771
16 changed files with 268 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpanelavatar.cpp
View File

@@ -546,7 +546,7 @@ BOOL LLPanelAvatarFirstLife::postBuild(void)
BOOL LLPanelAvatarNotes::postBuild(void)
{
childSetCommitCallback("notes edit",onCommitNotes,this);
getChild<LLUICtrl>("notes edit")->setCommitCallback(boost::bind(&LLPanelAvatar::sendAvatarNotesUpdate, getPanelAvatar()));
LLTextEditor* te = getChild<LLTextEditor>("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()