diff options
author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
commit | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch) | |
tree | 326e829b4233658ba8698e06ff17267618e93a62 /indra/newview/lltracker.h | |
parent | becc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff) | |
parent | e4a4d75104916968ce03337094b1194e0daff438 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/lltracker.h')
-rw-r--r-- | indra/newview/lltracker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltracker.h b/indra/newview/lltracker.h index c0c154abe8..8e916af315 100644 --- a/indra/newview/lltracker.h +++ b/indra/newview/lltracker.h @@ -75,7 +75,7 @@ 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 (BOOL) instance()->mTrackingStatus; } + static BOOL isTracking(void*) { return instance()->mTrackingStatus != TRACKING_NOTHING; } static void stopTracking(void*); static void clearFocus(); |