diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-04 17:29:48 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-04 17:29:48 -0700 |
| commit | b64700913f3eecd245503b5a0162c9cc5a2df35e (patch) | |
| tree | 0396fe0db9d11116b2603cfe476364cd651bae7d /indra/newview/llfloaterpathfindingcharacters.h | |
| parent | e85909aa9b52ac439f2886ca0048069fb9561893 (diff) | |
PATH-676: Correcting selection behavior so that the first selected object does remain invisible after changing the selection.
Diffstat (limited to 'indra/newview/llfloaterpathfindingcharacters.h')
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h index f62766df22..6be359e50d 100644 --- a/indra/newview/llfloaterpathfindingcharacters.h +++ b/indra/newview/llfloaterpathfindingcharacters.h @@ -44,12 +44,11 @@ public: BOOL isShowPhysicsCapsule() const; void setShowPhysicsCapsule(BOOL pIsShowPhysicsCapsule); - BOOL isPhysicsCapsuleEnabled( LLUUID& id, LLVector3& pos ); + BOOL isPhysicsCapsuleEnabled(LLUUID& id, LLVector3& pos) const; static void openCharactersViewer(); static LLHandle<LLFloaterPathfindingCharacters> getInstanceHandle(); - protected: friend class LLFloaterReg; @@ -69,23 +68,27 @@ protected: virtual LLPathfindingObjectListPtr getEmptyObjectList() const; - private: - void onShowPhysicsCapsuleClicked(); + void onShowPhysicsCapsuleClicked(); + + LLSD buildCharacterScrollListData(const LLPathfindingCharacter *pCharacterPtr) const; + + void updateStateOnEditFields(); + void updateOnScrollListChange(); - LLSD buildCharacterScrollListData(const LLPathfindingCharacter *pCharacterPtr) const; - void updateStateOnEditFields(); - LLUUID getUUIDFromSelection( LLVector3& pos ); - void unhideAnyCharacters(); + void showCapsule() const; + void hideCapsule() const; + + bool getCapsulePosition(LLVector3 &pPosition) const; LLCheckBoxCtrl *mShowPhysicsCapsuleCheckBox; + LLUUID mSelectedCharacterId; + LLColor4 mBeaconColor; LLRootHandle<LLFloaterPathfindingCharacters> mSelfHandle; static LLHandle<LLFloaterPathfindingCharacters> sInstanceHandle; - -public: }; #endif // LL_LLFLOATERPATHFINDINGCHARACTERS_H |