diff options
Diffstat (limited to 'indra/llcommon/llerror.cpp')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 9 | 
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index a34b50f816..2ef748e3e4 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -374,9 +374,8 @@ namespace  	class Globals : public LLSingleton<Globals>  	{ +		LLSINGLETON(Globals);  	public: -		Globals(); -  		std::ostringstream messageStream;  		bool messageStreamInUse; @@ -449,9 +448,8 @@ namespace LLError  	class Settings : public LLSingleton<Settings>  	{ +		LLSINGLETON(Settings);  	public: -		Settings(); -  		SettingsConfigPtr getSettingsConfig();  		void reset(); @@ -486,8 +484,7 @@ namespace LLError  		mRecorders.clear();  	} -	Settings::Settings() -		: LLSingleton<Settings>(), +	Settings::Settings():  		mSettingsConfig(new SettingsConfig())  	{  	}  | 
