diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index ec6f445e82..e7eb2d591e 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -108,35 +108,11 @@ private:
 };
 
 
-
 std::string FSData::blacklist_version;
 LLSD FSData::blocked_login_info = 0;
 std::map<LLSD, std::string> legacy_tags;
 BOOL FSData::msDataDone = FALSE;
 
-FSData* FSData::sInstance;
-
-FSData::FSData()
-{
-	sInstance = this;
-}
-
-FSData::~FSData()
-{
-	sInstance = NULL;
-}
-
-FSData* FSData::getInstance()
-{
-	if(sInstance)return sInstance;
-	else
-	{
-		sInstance = new FSData();
-		return sInstance;
-	}
-}
-
-
 
 void FSData::startDownload()
 {
diff --git a/indra/newview/fsdata.h b/indra/newview/fsdata.h
index 83b5c79808..634750db63 100644
--- a/indra/newview/fsdata.h
+++ b/indra/newview/fsdata.h
@@ -32,6 +32,7 @@
 #include <map>
 #include <llsd.h>
 #include <llinstantmessage.h>
+#include "llsingleton.h"
 
 struct LLSDcontent
 {
@@ -44,15 +45,10 @@ struct FSDataAgent
 	bool developer;
 };
 
-class FSData
+class FSData : public LLSingleton<FSData>
 {
 	LOG_CLASS(FSData);
-	FSData();
-	~FSData();
-	static FSData* sInstance;
 public:
-	static FSData* getInstance();
-
 	void startDownload();
 	void processData(U32 status, std::string body);
 	void downloadClientTags();