diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-28 11:32:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-28 11:32:05 -0400 |
| commit | 3d5a8cc2e3becd92c83fb87d65dfbe802738edde (patch) | |
| tree | 62f8c2b244d5f3779145d53288895dd6f3af1ccf /indra/newview/lltracker.h | |
| parent | 68e2813b41d676fd6ab5d79e934ac6ff75fb8a5b (diff) | |
| parent | 7617868658fec7fa70730a3448f8cfbe7661dd8e (diff) | |
merge late fix for SOCIAL-778 into 2.6.1 for release
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(); |