diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index c0fbf99360c571772cdb0cadc053da2d01fceef5..ced9833f4b6e912139aace5ec3eda19f3803da29 100755
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -82,9 +82,6 @@ const F32 COARSE_FREQUENCY = 2.2f;
 const F32 FIND_FREQUENCY = 29.7f;	// This results in a database query, so cut these back
 const F32 OFFLINE_SECONDS = FIND_FREQUENCY + 8.0f;
 
-// static
-LLAvatarTracker LLAvatarTracker::sInstance;
-
 static void on_avatar_name_cache_notify(const LLUUID& agent_id,
 										const LLAvatarName& av_name,
 										bool online,
@@ -239,8 +236,6 @@ const LLUUID& LLAvatarTracker::getAvatarID()
 
 S32 LLAvatarTracker::addBuddyList(const LLAvatarTracker::buddy_map_t& buds)
 {
-	using namespace std;
-
 	U32 new_buddy_count = 0;
 	std::string full_name;
 	LLUUID agent_id;
diff --git a/indra/newview/llcallingcard.h b/indra/newview/llcallingcard.h
index 978c44414992f21db805350c717d6d17e5034688..7f40b93d56216dc9f6386ace170030e1fabcd38d 100755
--- a/indra/newview/llcallingcard.h
+++ b/indra/newview/llcallingcard.h
@@ -79,11 +79,12 @@ public:
 };
 	
 
-class LLAvatarTracker
+class LLAvatarTracker : public LLSingleton<LLAvatarTracker>
 {
+protected:
+	friend class LLSingleton<LLAvatarTracker>;
+
 public:
-	static LLAvatarTracker& instance() { return sInstance; }
-	
 	void track(const LLUUID& avatar_id, const std::string& name);
 	void untrack(const LLUUID& avatar_id);
 	bool isTrackedAgentValid() { return mTrackedAgentValid; }
@@ -187,7 +188,6 @@ protected:
 	void processChange(LLMessageSystem* msg);
 
 protected:
-	static LLAvatarTracker sInstance;
 	LLTrackingData* mTrackingData;
 	bool mTrackedAgentValid;
 	U32 mModifyMask;
@@ -211,7 +211,7 @@ private:
 	LLAvatarTracker(const LLAvatarTracker&);
 	bool operator==(const LLAvatarTracker&);
 
-public:
+private:
 	// don't you dare create or delete this object
 	LLAvatarTracker();
 	~LLAvatarTracker();