From 667ca55bad0108c4bdf8f007b89e1a52fc766aad Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Mon, 5 Jan 2009 18:59:12 +0000
Subject: svn merge -r106715:HEAD
 svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715
 .  QAR-1149 -- Final merge of notifications to trunk.

---
 indra/llinventory/lleconomy.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h
index 4ac7cb4605..707f4451d1 100644
--- a/indra/llinventory/lleconomy.h
+++ b/indra/llinventory/lleconomy.h
@@ -47,6 +47,8 @@ public:
 	// become a singleton and this pattern will more easily disambiguate them.
 	typedef LLSingleton<LLGlobalEconomy> Singleton;
 
+	void initSingleton() { }
+
 	virtual void print();
 
 	static void processEconomyData(LLMessageSystem *msg, LLGlobalEconomy* econ_data);
-- 
cgit v1.2.3