diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
| commit | 0f958faacd37461a26af76d34a6b29744a2cd1ec (patch) | |
| tree | 2233d2143c3529a1ffd3b66ee9db5108abeb77f4 /indra/newview/llfloaterpathfindingcharacters.cpp | |
| parent | 1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb (diff) | |
| parent | eff9be530805298339f656f86a52ade9efeba779 (diff) | |
merge up to 3.3.3-release + pathfinding
Diffstat (limited to 'indra/newview/llfloaterpathfindingcharacters.cpp')
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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() |