From 328322436c046bf229de83041b29ebe5ce7c4029 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 22 Jun 2012 16:12:32 -0700
Subject: PATH-764,PATH-765: Adding in a context menu option on right-click of
 an object to show in the linksets floater if all objects are non-characters,
 or to show in the characters floater if all objects are characters.

---
 indra/newview/llfloaterpathfindingcharacters.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloaterpathfindingcharacters.cpp')

diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 09fd17855c..caf9fe382b 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -74,9 +74,10 @@ BOOL LLFloaterPathfindingCharacters::isPhysicsCapsuleEnabled(LLUUID& id, LLVecto
 	return (isShowPhysicsCapsule() &&  getCapsuleRenderData(pos, rot ));
 }
 
-void LLFloaterPathfindingCharacters::openCharactersViewer()
+void LLFloaterPathfindingCharacters::openCharactersWithSelectedObjects()
 {
-	LLFloaterReg::toggleInstanceOrBringToFront("pathfinding_characters");
+	LLFloaterPathfindingCharacters *charactersFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingCharacters>("pathfinding_characters");
+	charactersFloater->showFloaterWithSelectionObjects();
 }
 
 LLHandle<LLFloaterPathfindingCharacters> LLFloaterPathfindingCharacters::getInstanceHandle()
-- 
cgit v1.2.3