From 658ccc3e85487f9f24ff3b5926e60d6cce7f42e0 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Wed, 7 Apr 2010 11:08:04 -0700
Subject: Re-insert backed out SLE checkin so we can fix it

---
 indra/newview/llpanelgroup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llpanelgroup.cpp')

diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index c00b6a4147..716166a945 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -201,7 +201,7 @@ BOOL LLPanelGroup::postBuild()
 		mJoinText = panel_general->getChild<LLUICtrl>("join_cost_text");
 	}
 
-	gVoiceClient->addObserver(this);
+	LLVoiceClient::getInstance()->addObserver(this);
 	
 	return TRUE;
 }
@@ -322,7 +322,7 @@ void LLPanelGroup::onChange(EStatusType status, const std::string &channelURI, b
 		return;
 	}
 
-	childSetEnabled("btn_call", LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking());
+	childSetEnabled("btn_call", LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking());
 }
 
 void LLPanelGroup::notifyObservers()
-- 
cgit v1.2.3


From 78b3419fc895371aaeb4df9b886b3ee08c5ffd81 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Fri, 7 May 2010 08:51:23 +0300
Subject: EXT-7143 FIXED remove redundat code reviewed V.Savchuk at
 https://codereview.productengine.com/secondlife/r/358/

--HG--
branch : product-engine
---
 indra/newview/llpanelgroup.cpp | 68 +-----------------------------------------
 1 file changed, 1 insertion(+), 67 deletions(-)

(limited to 'indra/newview/llpanelgroup.cpp')

diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index c00b6a4147..39833a7201 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -92,8 +92,7 @@ LLPanelGroup::LLPanelGroup()
 :	LLPanel(),
 	LLGroupMgrObserver( LLUUID() ),
 	mSkipRefresh(FALSE),
-	mButtonJoin(NULL),
-	mShowingNotifyDialog(false)
+	mButtonJoin(NULL)
 {
 	// Set up the factory callbacks.
 	// Roles sub tabs
@@ -629,69 +628,4 @@ void LLPanelGroup::showNotice(const std::string& subject,
 
 }
 
-bool	LLPanelGroup::canClose()
-{
-	if(getVisible() == false)
-		return true;
-
-	bool need_save = false;
-	std::string mesg;
-	for(std::vector<LLPanelGroupTab* >::iterator it = mTabs.begin();it!=mTabs.end();++it)
-		if(need_save|=(*it)->needsApply(mesg))
-			break;
-	if(!need_save)
-		return false;
-	// If no message was provided, give a generic one.
-	if (mesg.empty())
-	{
-		mesg = mDefaultNeedsApplyMesg;
-	}
-	// Create a notify box, telling the user about the unapplied tab.
-	LLSD args;
-	args["NEEDS_APPLY_MESSAGE"] = mesg;
-	args["WANT_APPLY_MESSAGE"] = mWantApplyMesg;
-
-	LLNotificationsUtil::add("SaveChanges", args, LLSD(), boost::bind(&LLPanelGroup::handleNotifyCallback,this, _1, _2));
-
-	mShowingNotifyDialog = true;
-
-	return false;
-}
-
-bool	LLPanelGroup::notifyChildren(const LLSD& info)
-{
-	if(info.has("request") && mID.isNull() )
-	{
-		std::string str_action = info["request"];
-
-		if (str_action == "quit" )
-		{
-			canClose();
-			return true;
-		}
-		if(str_action == "wait_quit")
-			return mShowingNotifyDialog;
-	}
-	return false;
-}
-bool LLPanelGroup::handleNotifyCallback(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-	mShowingNotifyDialog = false;
-	switch (option)
-	{
-	case 0: // "Apply Changes"
-		apply();
-		break;
-	case 1: // "Ignore Changes"
-		break;
-	case 2: // "Cancel"
-	default:
-		// Do nothing.  The user is canceling the action.
-		// If we were quitting, we didn't really mean it.
-		LLAppViewer::instance()->abortQuit();
-		break;
-	}
-	return false;
-}
 
-- 
cgit v1.2.3