diff options
author | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
commit | be69197e0d3af1832a22c6d2475e3e1178a88a31 (patch) | |
tree | de9abd1dfc12d6da7e11e385c7dbbb53e631353a /indra/newview/lltracker.h | |
parent | 04c7a7a64ac40f471dcec0019a2c7235ad22bd3d (diff) | |
parent | e9f5ed6591fb5d2513b5065622b9e7dac6737913 (diff) |
merge changes from project trunk
Diffstat (limited to 'indra/newview/lltracker.h')
-rw-r--r-- | indra/newview/lltracker.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lltracker.h b/indra/newview/lltracker.h index a1c5052c1b..4a6f10b767 100644 --- a/indra/newview/lltracker.h +++ b/indra/newview/lltracker.h @@ -74,8 +74,8 @@ public: // these are static so that they can be used a callbacks static ETrackingStatus getTrackingStatus() { return instance()->mTrackingStatus; } static ETrackingLocationType getTrackedLocationType() { return instance()->mTrackingLocationType; } - static BOOL isTracking(void*) { return instance()->mTrackingStatus != TRACKING_NOTHING; } - static void stopTracking(void*); + static bool isTracking(void*) { return instance()->mTrackingStatus != TRACKING_NOTHING; } + static void stopTracking(bool); static void clearFocus(); static const LLUUID& getTrackedLandmarkAssetID() { return instance()->mTrackedLandmarkAssetID; } @@ -114,10 +114,10 @@ protected: LLHUDText* hud_textp, const std::string& label ); - void stopTrackingAll(BOOL clear_ui = FALSE); - void stopTrackingAvatar(BOOL clear_ui = FALSE); - void stopTrackingLocation(BOOL clear_ui = FALSE, BOOL dest_reached = FALSE); - void stopTrackingLandmark(BOOL clear_ui = FALSE); + void stopTrackingAll(bool clear_ui = false); + void stopTrackingAvatar(bool clear_ui = false); + void stopTrackingLocation(bool clear_ui = false, bool dest_reached = false); + void stopTrackingLandmark(bool clear_ui = false); void drawMarker(const LLVector3d& pos_global, const LLColor4& color); void setLandmarkVisited(); |