PATH-292: Fixing the post-modify update handler to update the linkset list rather than overwrite it.

1 files changed, 21 insertions, 1 deletions

diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 73ab01a89f..2b3007b435 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -320,7 +320,7 @@ void LLFloaterPathfindingLinksets::requestSetLinksets(LLPathfindingLinksetListPt
 	llassert(!isMessagingInProgress());

 	if (!isMessagingInProgress())

 	{

-		switch (LLPathfindingManager::getInstance()->requestSetLinksets(pLinksetList, pLinksetUse, pA, pB, pC, pD, boost::bind(&LLFloaterPathfindingLinksets::handleNewLinksets, this, _1, _2)))

+		switch (LLPathfindingManager::getInstance()->requestSetLinksets(pLinksetList, pLinksetUse, pA, pB, pC, pD, boost::bind(&LLFloaterPathfindingLinksets::handleUpdateLinksets, this, _1, _2)))

 		{

 		case LLPathfindingManager::kLinksetsRequestStarted :

 			setMessagingState(kMessagingSetRequestSent);

@@ -359,6 +359,26 @@ void LLFloaterPathfindingLinksets::handleNewLinksets(LLPathfindingManager::ELink
 	}

 }

 

+void LLFloaterPathfindingLinksets::handleUpdateLinksets(LLPathfindingManager::ELinksetsRequestStatus pLinksetsRequestStatus, LLPathfindingLinksetListPtr pLinksetsListPtr)

+{

+	mLinksetsListPtr->update(*pLinksetsListPtr);

+	updateScrollList();

+

+	switch (pLinksetsRequestStatus)

+	{

+	case LLPathfindingManager::kLinksetsRequestCompleted :

+		setMessagingState(kMessagingComplete);

+		break;

+	case LLPathfindingManager::kLinksetsRequestError :

+		setMessagingState(kMessagingSetError);

+		break;

+	default :

+		setMessagingState(kMessagingSetError);

+		llassert(0);

+		break;

+	}

+}

+

 void LLFloaterPathfindingLinksets::onApplyAllFilters()

 {

 	applyFilters();