merge

1 files changed, 2 insertions, 0 deletions

diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 27047b4fd9..f17cd3c6b8 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -685,6 +685,7 @@ void LLFloaterPathfindingLinksets::updateScrollList()
 		}

 	}

 

+	S32 origScrollPosition = mLinksetsScrollList->getScrollPos();

 	mLinksetsScrollList->deleteAllItems();

 

 	if (mLinksetsListPtr != NULL)

@@ -732,6 +733,7 @@ void LLFloaterPathfindingLinksets::updateScrollList()
 	}

 

 	mLinksetsScrollList->selectMultiple(selectedUUIDs);

+	mLinksetsScrollList->setScrollPos(origScrollPosition);

 	updateEditFieldValues();

 	updateControls();

 }