aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltracker.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/lltracker.cpp
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/lltracker.cpp')
-rw-r--r--linden/indra/newview/lltracker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index 58ba9b8..80d35dd 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -264,7 +264,7 @@ void LLTracker::render3D()
264 else 264 else
265 { 265 {
266 const LLRelationship* buddy = av_tracker.getBuddyInfo(avatar_id); 266 const LLRelationship* buddy = av_tracker.getBuddyInfo(avatar_id);
267 if(buddy && !buddy->isOnline()) 267 if(buddy && !buddy->isOnline() && !gAgent.isGodlike())
268 { 268 {
269 stop_tracking = TRUE; 269 stop_tracking = TRUE;
270 } 270 }
@@ -556,8 +556,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
556 //gCylinder.render(1000); 556 //gCylinder.render(1000);
557 glPopMatrix(); 557 glPopMatrix();
558 558
559 char text[1024]; 559 char text[1024]; /* Flawfinder: ignore */
560 sprintf(text, "%.0f m", to_vec.magVec()); 560 snprintf(text, sizeof(text), "%.0f m", to_vec.magVec()); /* Flawfinder: ignore */
561 561
562 LLWString wstr; 562 LLWString wstr;
563 wstr += utf8str_to_wstring(label); 563 wstr += utf8str_to_wstring(label);