merge

1 files changed, 3 insertions, 1 deletions

diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 571c4a8427..4d3581fc60 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -372,6 +372,7 @@ void LLFloaterPathfindingLinksets::setMessagingState(EMessagingState pMessagingS
 {

 	mMessagingState = pMessagingState;

 	updateLinksetsStatusMessage();

+	updateEditFields();

 }

 

 void LLFloaterPathfindingLinksets::onApplyFiltersClicked()

@@ -524,6 +525,7 @@ void LLFloaterPathfindingLinksets::updateLinksetsList()
 

 	mLinksetsScrollList->selectMultiple(selectedUUIDs);

 	updateLinksetsStatusMessage();

+	updateEditFields();

 }

 

 void LLFloaterPathfindingLinksets::selectAllLinksets()

@@ -670,7 +672,7 @@ void LLFloaterPathfindingLinksets::applyEditFields()
 			const LLFilteredPathfindingLinksets::PathfindingLinksetMap::const_iterator linksetIter = linksetsMap.find(uuid.asString());

 			const LLPathfindingLinkset &linkset = linksetIter->second;

 

-			LLSD itemData = linkset.getAlteredFields(pathState, aValue, bValue, cValue, dValue, isPhantom);

+			LLSD itemData = linkset.encodeAlteredFields(pathState, aValue, bValue, cValue, dValue, isPhantom);

 

 			if (!itemData.isUndefined())

 			{