From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 4 Jan 2007 02:04:29 +0000 Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL --- indra/newview/llpanelavatar.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelavatar.cpp') diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index b013befca5..6f812e9e35 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -824,6 +824,20 @@ void LLPanelAvatarClassified::enableControls(BOOL self) { } +BOOL LLPanelAvatarClassified::titleIsValid() +{ + LLTabContainerCommon* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab"); + for (S32 i = 0; i < tabs->getTabCount(); i++) + { + LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i); + if ( ! panel->titleIsValid() ) + { + return FALSE; + } + } + + return TRUE; +} void LLPanelAvatarClassified::apply() { @@ -1624,12 +1638,15 @@ void LLPanelAvatar::onClickOK(void *userdata) { self->sendAvatarPropertiesUpdate(); - self->mPanelClassified->apply(); - - LLFloaterAvatarInfo *infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID); - if (infop) + if ( self->mPanelClassified->titleIsValid() ) { - infop->close(); + self->mPanelClassified->apply(); + + LLFloaterAvatarInfo *infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID); + if (infop) + { + infop->close(); + } } } } -- cgit v1.2.3