diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-07-24 17:50:24 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-07-24 17:50:24 -0700 |
| commit | b8cca9c6e66fa761fa104645effb1b672a8a99ae (patch) | |
| tree | f0a6cd5874ae8b52f4566c1599179b7cb5b2a922 /indra/newview/llfloaterpathfindingcharacters.cpp | |
| parent | 4feef5af63f6294249aa50e37fba712cd9ddec91 (diff) | |
Adding a group identifier to the group objects in the pathfinding linksets and characters floaters.
Diffstat (limited to 'indra/newview/llfloaterpathfindingcharacters.cpp')
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp index ef6388642a..99d262344c 100644 --- a/indra/newview/llfloaterpathfindingcharacters.cpp +++ b/indra/newview/llfloaterpathfindingcharacters.cpp @@ -30,6 +30,8 @@ #include "llfloaterpathfindingcharacters.h" +#include <string> + #include "llcheckboxctrl.h" #include "llfloaterreg.h" #include "llfloaterpathfindingobjects.h" @@ -210,9 +212,13 @@ LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListData(const LLPathfi columns[1]["value"] = pCharacterPtr->getDescription(); columns[2]["column"] = "owner"; - columns[2]["value"] = (pCharacterPtr->hasOwner() ? - (pCharacterPtr->hasOwnerName() ? pCharacterPtr->getOwnerName() : getString("character_owner_loading")) : - getString("character_owner_unknown")); + columns[2]["value"] = (pCharacterPtr->hasOwner() + ? (pCharacterPtr->hasOwnerName() + ? (pCharacterPtr->isGroupOwned() + ? (pCharacterPtr->getOwnerName() + " " + getString("character_owner_group")) + : pCharacterPtr->getOwnerName()) + : getString("character_owner_loading")) + : getString("character_owner_unknown")); S32 cpuTime = llround(pCharacterPtr->getCPUTime()); std::string cpuTimeString = llformat("%d", cpuTime); |