From cce2e278d0ea0c6db51ac0b70a234fac6f5438b9 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 21 Jan 2012 14:07:03 +0100
Subject: [PATCH] Fixed crashes after merge when trying to access the people
 panel

---
 indra/newview/fslslbridgerequest.cpp | 2 +-
 indra/newview/llnetmap.cpp           | 4 ++--
 indra/newview/llpanelpeoplemenus.cpp | 4 ++--
 indra/newview/llviewermessage.cpp    | 2 +-
 indra/newview/rlvui.cpp              | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/newview/fslslbridgerequest.cpp b/indra/newview/fslslbridgerequest.cpp
index 88b01fcab3..6eeaf1fcad 100644
--- a/indra/newview/fslslbridgerequest.cpp
+++ b/indra/newview/fslslbridgerequest.cpp
@@ -94,7 +94,7 @@ FSLSLBridgeRequestRadarPosResponder::FSLSLBridgeRequestRadarPosResponder()
 }
 void FSLSLBridgeRequestRadarPosResponder::result(const LLSD& content)
 {
-	LLPanel* panel_people = LLFloaterSidePanelContainer::getPanel("panel_people");
+	LLPanel* panel_people = LLFloaterSidePanelContainer::getPanel("people", "panel_people");
 	if (panel_people)
 	{
 		LLAvatarList* nearbyList = ((LLPanelPeople*)panel_people)->getNearbyList();
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index e349c1bba9..5ef39cb641 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -821,7 +821,7 @@ BOOL LLNetMap::handleToolTipAgent(const LLUUID& avatar_id)
 			// Ansariel: Try to get distance from the nearby people panel
 			//           aka radar. This usually contains better data,
 			//           especially when above 1020m.
-			LLPanel* panel_people = LLFloaterSidePanelContainer::getPanel("panel_people");
+			LLPanel* panel_people = LLFloaterSidePanelContainer::getPanel("people", "panel_people");
 			if (panel_people != NULL)
 			{
 				LLAvatarListItem* avatar_list_item = ((LLPanelPeople*)panel_people)->getNearbyList()->getAvatarListItem(avatar_id);
@@ -1282,7 +1282,7 @@ void LLNetMap::startTracking()
 {
 	if (mClosestAgentAtLastRightClick.notNull())
 	{
-		LLPanelPeople* panel_people = (LLPanelPeople*)LLFloaterSidePanelContainer::getPanel("panel_people");
+		LLPanelPeople* panel_people = (LLPanelPeople*)LLFloaterSidePanelContainer::getPanel("people", "panel_people");
 		if (panel_people != NULL)
 		{
 			panel_people->startTracking(mClosestAgentAtLastRightClick);
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index db4169bea1..e226308117 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -226,14 +226,14 @@ void NearbyMenu::teleportToAvatar()
 // AO: wrapper for functionality managed by LLPanelPeople, because it manages the nearby avatar list.
 // Will only work for avatars within radar range.
 {
-	LLPanelPeople* peoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("panel_people"));
+	LLPanelPeople* peoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("people", "panel_people"));
 	peoplePanel->teleportToAvatar(mUUIDs.front());
 }
 
 // Ansariel: Avatar tracking feature
 void NearbyMenu::onTrackAvatarMenuItemClick()
 {
-	LLPanelPeople* peoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("panel_people"));
+	LLPanelPeople* peoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("people", "panel_people"));
 	peoplePanel->startTracking(mUUIDs.front());
 }
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 1d9da5394c..9d7ea16902 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5036,7 +5036,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 	// sound assets as a request for a full radar update to a channel
 	if ((owner_id == gAgent.getID()) && (sound_id.asString() == gSavedSettings.getString("RadarLegacyChannelAlertRefreshUUID")))
         {
-	        LLPanelPeople* pPeoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("panel_people"));
+	        LLPanelPeople* pPeoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("people", "panel_people"));
                 if (pPeoplePanel)
                         pPeoplePanel->requestRadarChannelAlertSync();
 		return;
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index d835cf98fe..4df54131fc 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -405,7 +405,7 @@ void RlvUIEnabler::onToggleShowMinimap()
 	// ND_MERGE
 
 	// Break/reestablish the visibility connection for the nearby people panel embedded minimap instance
-	LLPanel* pPeoplePanel = LLFloaterSidePanelContainer::getPanel("panel_people");
+	LLPanel* pPeoplePanel = LLFloaterSidePanelContainer::getPanel("people", "panel_people");
 	LLPanel* pNetMapPanel = (pPeoplePanel) ? pPeoplePanel->getChild<LLPanel>("minimaplayout", TRUE) : NULL;  //AO: firestorm specific
 	RLV_ASSERT( (pPeoplePanel) && (pNetMapPanel) );
 	if (pNetMapPanel)
@@ -426,7 +426,7 @@ void RlvUIEnabler::onToggleShowNames(bool fQuitting)
 	bool fEnable = !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES);
 
 	// Refresh the nearby people list
-	LLPanelPeople* pPeoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("panel_people"));
+	LLPanelPeople* pPeoplePanel = dynamic_cast<LLPanelPeople*>(LLFloaterSidePanelContainer::getPanel("people", "panel_people"));
 	RLV_ASSERT( (pPeoplePanel) && (pPeoplePanel->getNearbyList()) );
 	if ( (pPeoplePanel) && (pPeoplePanel->getNearbyList()) )
 		pPeoplePanel->getNearbyList()->updateAvatarNames();