diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-29 19:21:41 -0400 |
| commit | 7cb4f2d87dc8619d8ad86cb82f6687f1a9821a69 (patch) | |
| tree | 76eb80864288acd35fa7b0892a5aba96c13a860c /indra/newview/lltracker.h | |
| parent | 39d83cb74f5978e926ff02dcb20a64802429bc69 (diff) | |
| parent | 9c0757511ec4ed12b47c6d3fd2ef20fca6828a6e (diff) | |
merge changes for storm-1086
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(); |