diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-16 21:27:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-16 21:27:50 -0400 |
| commit | a0be18bd2e268f692e781d376be7bef4e71e46fb (patch) | |
| tree | 6e43af94f76e524c9d0556b1801d870d75231963 /indra/newview/llfloaterpathfindinglinksets.h | |
| parent | 75a3183ad778cf2b7e2ed343345a82e3c0202ab0 (diff) | |
| parent | 331a76afaaed8f802cf8c313eed8a287e75e93fc (diff) | |
merge changes for DRTVWR-197
Diffstat (limited to 'indra/newview/llfloaterpathfindinglinksets.h')
| -rw-r--r-- | indra/newview/llfloaterpathfindinglinksets.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h index 342a64fc77..6538308122 100644 --- a/indra/newview/llfloaterpathfindinglinksets.h +++ b/indra/newview/llfloaterpathfindinglinksets.h @@ -58,11 +58,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; @@ -78,10 +80,11 @@ private: void clearFilters(); void updateEditFieldValues(); - LLSD buildLinksetScrollListData(const LLPathfindingLinkset *pLinksetPtr, const LLVector3 &pAvatarPosition) const; + LLSD buildLinksetScrollListItemData(const LLPathfindingLinkset *pLinksetPtr, const LLVector3 &pAvatarPosition) const; LLSD buildLinksetUseScrollListData(const std::string &pLabel, S32 pValue) const; bool isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; + bool isShowPhantomToggleWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; bool isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; void updateStateOnEditFields(); |