diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/lltracker.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/lltracker.cpp')
| -rw-r--r-- | indra/newview/lltracker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index d1b87281f0..85d9504740 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -285,7 +285,7 @@ void LLTracker::render3D() // static -void LLTracker::trackAvatar( const LLUUID& avatar_id, const LLString& name ) +void LLTracker::trackAvatar( const LLUUID& avatar_id, const std::string& name ) { instance()->stopTrackingLandmark(); instance()->stopTrackingLocation(); @@ -297,7 +297,7 @@ void LLTracker::trackAvatar( const LLUUID& avatar_id, const LLString& name ) // static -void LLTracker::trackLandmark( const LLUUID& asset_id, const LLUUID& item_id, const LLString& name) +void LLTracker::trackLandmark( const LLUUID& asset_id, const LLUUID& item_id, const std::string& name) { instance()->stopTrackingAvatar(); instance()->stopTrackingLocation(); @@ -312,7 +312,7 @@ void LLTracker::trackLandmark( const LLUUID& asset_id, const LLUUID& item_id, co // static -void LLTracker::trackLocation(const LLVector3d& pos_global, const LLString& full_name, const LLString& tooltip, ETrackingLocationType location_type) +void LLTracker::trackLocation(const LLVector3d& pos_global, const std::string& full_name, const std::string& tooltip, ETrackingLocationType location_type) { instance()->stopTrackingAvatar(); instance()->stopTrackingLandmark(); @@ -398,7 +398,7 @@ BOOL LLTracker::hasLandmarkPosition() // static -const LLString& LLTracker::getTrackedLocationName() +const std::string& LLTracker::getTrackedLocationName() { return instance()->mTrackedLocationName; } @@ -557,8 +557,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global, //gCylinder.render(1000); glPopMatrix(); - char text[1024]; /* Flawfinder: ignore */ - snprintf(text, sizeof(text), "%.0f m", to_vec.magVec()); /* Flawfinder: ignore */ + std::string text; + text = llformat( "%.0f m", to_vec.magVec()); LLWString wstr; wstr += utf8str_to_wstring(label); |