summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-21 10:21:54 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-03-21 10:21:54 -0700
commit07717a60dc3bce644dc08d7e8b2fa74715b9c7c0 (patch)
tree39bbe0e621f8bcc04469f569ba8fb59afe148ee5
parentfa4986e9781651626a6a467057509d653d98cf40 (diff)
parenta6ff010dc1bee1b526fd8a83f9ef71d1e51bd082 (diff)
Merge
-rw-r--r--indra/newview/llviewermessage.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 4203ba74b2..947408f125 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3776,7 +3776,6 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
}
}
-
if ( LLTracker::isTracking(NULL) )
{
// Check distance to beacon, if < 5m, remove beacon