Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

1 files changed, 1 insertions, 8 deletions

diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h
index 47fcf688a2..83836b7ce1 100755
--- a/indra/llinventory/lleconomy.h
+++ b/indra/llinventory/lleconomy.h
@@ -42,19 +42,12 @@ public:
 	virtual void onEconomyDataChange() = 0;
 };
 
-class LLGlobalEconomy
+class LLGlobalEconomy: public LLSingleton<LLGlobalEconomy>
 {
 public:
 	LLGlobalEconomy();
 	virtual ~LLGlobalEconomy();
 
-	// This class defines its singleton internally as a typedef instead of inheriting from
-	// LLSingleton like most others because the LLRegionEconomy sub-class might also
-	// become a singleton and this pattern will more easily disambiguate them.
-	typedef LLSingleton<LLGlobalEconomy> Singleton;
-
-	void initSingleton() { }
-
 	virtual void print();
 
 	void	addObserver(LLEconomyObserver* observer);