diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-25 17:16:29 -0400 |
| commit | 0f958faacd37461a26af76d34a6b29744a2cd1ec (patch) | |
| tree | 2233d2143c3529a1ffd3b66ee9db5108abeb77f4 /indra/newview/llfloaterpathfindingobjects.h | |
| parent | 1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb (diff) | |
| parent | eff9be530805298339f656f86a52ade9efeba779 (diff) | |
merge up to 3.3.3-release + pathfinding
Diffstat (limited to 'indra/newview/llfloaterpathfindingobjects.h')
| -rw-r--r-- | indra/newview/llfloaterpathfindingobjects.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpathfindingobjects.h b/indra/newview/llfloaterpathfindingobjects.h index 88790db12d..6d5d6d24b2 100644 --- a/indra/newview/llfloaterpathfindingobjects.h +++ b/indra/newview/llfloaterpathfindingobjects.h @@ -36,6 +36,7 @@ #include "llpathfindingobject.h" #include "llpathfindingobjectlist.h" #include "llselectmgr.h" +#include "lluuid.h" #include "v4color.h" class LLAvatarName; @@ -90,6 +91,8 @@ protected: virtual const LLColor4 &getBeaconTextColor() const; virtual S32 getBeaconWidth() const; + void showFloaterWithSelectionObjects(); + BOOL isShowBeacons() const; void clearAllObjects(); void selectAllObjects(); @@ -158,6 +161,9 @@ private: LLObjectSelectionHandle mObjectsSelection; + bool mHasObjectsToBeSelected; + uuid_vec_t mObjectsToBeSelected; + boost::signals2::connection mSelectionUpdateSlot; boost::signals2::connection mRegionBoundaryCrossingSlot; LLAgent::god_level_change_slot_t mGodLevelChangeSlot; |