diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-25 12:31:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-25 12:31:57 -0400 |
| commit | 33afaadf5b6ac5ecfd24f9cf5c945e09e1dd57bb (patch) | |
| tree | 969ec483df1459fe64459cf4dd052adfd95154a7 /indra/newview/llfloaterpathfindinglinksets.cpp | |
| parent | 01b7959e01d985e96d20175eb28cfefb54c0080b (diff) | |
| parent | b8cca9c6e66fa761fa104645effb1b672a8a99ae (diff) | |
pull latest pathfinding changes from integration branch
Diffstat (limited to 'indra/newview/llfloaterpathfindinglinksets.cpp')
| -rw-r--r-- | indra/newview/llfloaterpathfindinglinksets.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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()); |