Second Life viewer sources 1.20.2

1 files changed, 8 insertions, 3 deletions

diff --git a/linden/indra/llinventory/lleconomy.h b/linden/indra/llinventory/lleconomy.h
index c5caa42..dcc97b2 100644
--- a/linden/indra/llinventory/lleconomy.h
+++ b/linden/indra/llinventory/lleconomy.h
@@ -31,6 +31,8 @@
 #ifndef LL_LLECONOMY_H
 #define LL_LLECONOMY_H
 
+#include "llmemory.h"
+
 class LLMessageSystem;
 class LLVector3;
 
@@ -40,9 +42,14 @@ 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;
+
         virtual void print();
 
-        static void processEconomyData(LLMessageSystem *msg, void **user_data);
+        static void processEconomyData(LLMessageSystem *msg, LLGlobalEconomy* econ_data);
 
         S32             calculateTeleportCost(F32 distance) const;
         S32             calculateLightRent(const LLVector3& object_size) const;
@@ -136,6 +143,4 @@ private:
 
 };
 
-extern LLGlobalEconomy* gGlobalEconomy;
-
 #endif