livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding a group identifier to the group objects in the pathfinding linksets and characters floaters.

meow-7.2.2
Todd Stinson 2012-07-24 17:50:24 -07:00
parent 4feef5af63
commit b8cca9c6e6
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloaterpathfindingcharacters.cpp
View File

@ -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);

10
indra/newview/llfloaterpathfindinglinksets.cpp
View File

@ -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());

3
indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
View File

@ -24,7 +24,8 @@
<floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
<floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
<floater.string name="character_owner_loading">[Loading]</floater.string>
<floater.string name="character_owner_unknown">Unknown</floater.string>
<floater.string name="character_owner_unknown">[Unknown]</floater.string>
<floater.string name="character_owner_group">[group]</floater.string>
<panel
border="false"
bevel_style="none"

3
indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
View File

@ -28,7 +28,8 @@
<floater.string name="linkset_terrain_land_impact">--</floater.string>
<floater.string name="linkset_terrain_dist_from_you">--</floater.string>
<floater.string name="linkset_owner_loading">[Loading]</floater.string>
<floater.string name="linkset_owner_unknown">Unknown</floater.string>
<floater.string name="linkset_owner_unknown">[Unknown]</floater.string>
<floater.string name="linkset_owner_group">[group]</floater.string>
<floater.string name="linkset_use_walkable">Walkable</floater.string>
<floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
<floater.string name="linkset_use_dynamic_obstacle">Movable obstacle</floater.string>