Migrated restoration of physics capsule into pathing character

1 files changed, 20 insertions, 0 deletions

diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 8915683b6d..0dbc2a303a 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -57,8 +57,11 @@ void LLFloaterPathfindingCharacters::openCharactersViewer()
 {
 	LLFloaterReg::toggleInstanceOrBringToFront("pathfinding_characters");
 }
+
 void LLFloaterPathfindingCharacters::onClose(bool pIsAppQuitting)
 {
+	unhideAnyCharacters();
+	LLFloaterPathfindingObjects::onClose( pIsAppQuitting );
 }
 
 LLFloaterPathfindingCharacters::LLFloaterPathfindingCharacters(const LLSD& pSeed)
@@ -246,3 +249,20 @@ void LLFloaterPathfindingCharacters::updateStateOnEditFields()
 
 	LLFloaterPathfindingObjects::updateStateOnEditFields();
 }
+
+
+void LLFloaterPathfindingCharacters::unhideAnyCharacters( )
+{
+	std::vector<LLScrollListItem*> selectedItems = mObjectsScrollList->getAllSelected();
+	int numSelectedItems = selectedItems.size();
+	uuid_vec_t selectedUUIDs;
+	if (numSelectedItems > 0)
+	{
+		for (std::vector<LLScrollListItem*>::const_iterator itemIter = selectedItems.begin();
+			 itemIter != selectedItems.end(); ++itemIter)
+		{
+			const LLScrollListItem *listItem = *itemIter;
+			gPipeline.restoreHiddenObject( listItem->getUUID() );
+		}
+	}
+}