diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-24 13:57:57 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-24 13:57:57 -0700 |
| commit | 31d69a6bc5a81dc3e844138033e41e339dce3aa1 (patch) | |
| tree | 39119d49fcbbaf3cf7fda13b7b62970e1a2a5999 /indra/newview/llfloaterpathfindingcharacters.h | |
| parent | 6e92b96e88401aaca203b627e84ce311b7f75e4a (diff) | |
| parent | b19e6c295972c83a2637a29007bc5d0a92711ea9 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llfloaterpathfindingcharacters.h')
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h index ef389ad428..4021f4f119 100644 --- a/indra/newview/llfloaterpathfindingcharacters.h +++ b/indra/newview/llfloaterpathfindingcharacters.h @@ -62,11 +62,13 @@ protected: virtual void requestGetObjects(); - virtual LLSD convertObjectsIntoScrollListData(const LLPathfindingObjectListPtr pObjectListPtr); + virtual void buildObjectsScrollList(const LLPathfindingObjectListPtr pObjectListPtr); virtual void updateControlsOnScrollListChange(); virtual S32 getNameColumnIndex() const; + virtual S32 getOwnerNameColumnIndex() const; + virtual std::string getOwnerName(const LLPathfindingObject *pObject) const; virtual const LLColor4 &getBeaconColor() const; virtual LLPathfindingObjectListPtr getEmptyObjectList() const; @@ -74,7 +76,7 @@ protected: private: void onShowPhysicsCapsuleClicked(); - LLSD buildCharacterScrollListData(const LLPathfindingCharacter *pCharacterPtr) const; + LLSD buildCharacterScrollListItemData(const LLPathfindingCharacter *pCharacterPtr) const; void updateStateOnDisplayControls(); void showSelectedCharacterCapsules(); |