From b8cca9c6e66fa761fa104645effb1b672a8a99ae Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Tue, 24 Jul 2012 17:50:24 -0700 Subject: Adding a group identifier to the group objects in the pathfinding linksets and characters floaters. --- indra/newview/llfloaterpathfindinglinksets.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloaterpathfindinglinksets.cpp') diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp index ecb68a786a..877bd0822d 100644 --- a/indra/newview/llfloaterpathfindinglinksets.cpp +++ b/indra/newview/llfloaterpathfindinglinksets.cpp @@ -404,9 +404,13 @@ LLSD LLFloaterPathfindingLinksets::buildLinksetScrollListData(const LLPathfindin columns[1]["value"] = pLinksetPtr->getDescription(); columns[2]["column"] = "owner"; - columns[2]["value"] = (pLinksetPtr->hasOwner() ? - (pLinksetPtr->hasOwnerName() ? pLinksetPtr->getOwnerName() : getString("linkset_owner_loading")) : - getString("linkset_owner_unknown")); + columns[2]["value"] = (pLinksetPtr->hasOwner() + ? (pLinksetPtr->hasOwnerName() + ? (pLinksetPtr->isGroupOwned() + ? (pLinksetPtr->getOwnerName() + " " + getString("linkset_owner_group")) + : pLinksetPtr->getOwnerName()) + : getString("linkset_owner_loading")) + : getString("linkset_owner_unknown")); columns[3]["column"] = "land_impact"; columns[3]["value"] = llformat("%1d", pLinksetPtr->getLandImpact()); -- cgit v1.2.3