diff --git a/indra/newview/algamemode.cpp b/indra/newview/algamemode.cpp
index 580e25767130187943bc6e83ffa74fc73b1449fc..8ef5ba9aed2ba1d460d0a11209cf21a7eafe38cc 100644
--- a/indra/newview/algamemode.cpp
+++ b/indra/newview/algamemode.cpp
@@ -32,12 +32,20 @@
 
 #include <boost/signals2.hpp>
 
+// static 
+ALGameMode& ALGameMode::instance()
+{ 
+	static ALGameMode inst; 
+	return inst;
+}
+
 void ALGameMode::init()
 {
 		enable(gSavedSettings.getBool("AlchemyGameModeEnable"));
 		gSavedSettings.getControl("AlchemyGameModeEnable")->getCommitSignal()->connect(boost::bind(&ALGameMode::onToggleGameModeControl, this));
 }
 
+// static
 void ALGameMode::shutdown()
 {
 	gamemode_request_end();
diff --git a/indra/newview/algamemode.h b/indra/newview/algamemode.h
index 4ee293fff81d02a2603711a7725d18d53099fa1b..8fc18db3cca97d5a1eff7dd75eb9a4ac79d35e15 100644
--- a/indra/newview/algamemode.h
+++ b/indra/newview/algamemode.h
@@ -28,16 +28,16 @@ class ALGameMode final
 {
 
 public:
-	static ALGameMode &instance() { static ALGameMode inst; return inst;}
+	static ALGameMode &instance();
 
 	void enable(bool enable);
 	void init();
-	void shutdown();
+	static void shutdown();
 
 protected:
 	void onToggleGameModeControl();
-	bool mEnabled;
-	short mStatus;
+	bool mEnabled = false;
+	short mStatus = 0;
 };
 
 #endif // AL_GAMEMODE_H
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index 8c383ab15e66c1ccf18987889aa6484f9c039892..7a8ecb0ada120d108039420bd3d8c36f5951c5b9 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -118,7 +118,7 @@ int main( int argc, char **argv )
 	sentry_close();
 #endif
 
-	ALGameMode::instance().shutdown();
+	ALGameMode::shutdown();
 
 	return 0;
 }