diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-18 09:43:16 -0700 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-03-18 09:43:16 -0700 |
commit | a17ed876c8c55cb4f8977f5dbcec4ae99df98d70 (patch) | |
tree | 0a05c65995f984058d940574a8bb7e4be3a58065 /indra/newview/llworldmapview.cpp | |
parent | 0a0ba068bf5bc6d829440a12946174c6ed961843 (diff) | |
parent | a079acf1aa3b7cfe8ee35bb7afdbae83df0df5ca (diff) |
merge
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rw-r--r-- | indra/newview/llworldmapview.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index ccc513b80d..11b2770ec0 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -965,8 +965,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4& S32 text_x = x; S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight()); - BOOL is_in_window = true; - if( x < 0 || y < 0 || x >= getRect().getWidth() @@ -979,7 +977,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4& text_x = sTrackingArrowX; text_y = sTrackingArrowY; } - is_in_window = false; } else if (LLTracker::getTrackingStatus() == LLTracker::TRACKING_LOCATION && LLTracker::getTrackedLocationType() != LLTracker::LOCATION_NOTHING) |