svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/llcommon/llmortician.cpp b/indra/llcommon/llmortician.cpp
index cab3a7f973..b3e25104cb 100644
--- a/indra/llcommon/llmortician.cpp
+++ b/indra/llcommon/llmortician.cpp
@@ -33,20 +33,20 @@
 
 #include <list>
 
-std::list<LLMortician*> gGraveyard;
+std::list<LLMortician*> LLMortician::sGraveyard;
 
 BOOL LLMortician::sDestroyImmediate = FALSE;
 
 LLMortician::~LLMortician() 
 {
-	gGraveyard.remove(this);
+	sGraveyard.remove(this);
 }
 
 void LLMortician::updateClass() 
 {
-	while (!gGraveyard.empty()) 
+	while (!sGraveyard.empty()) 
 	{
-		LLMortician* dead = gGraveyard.front();
+		LLMortician* dead = sGraveyard.front();
 		delete dead;
 	}
 }
@@ -56,7 +56,7 @@ void LLMortician::die()
 	// It is valid to call die() more than once on something that hasn't died yet
 	if (sDestroyImmediate)
 	{
-		// *NOTE: This is a hack to ensure destruction order on shutdown.
+		// *NOTE: This is a hack to ensure destruction order on shutdown (relative to non-mortician controlled classes).
 		mIsDead = TRUE;
 		delete this;
 		return;
@@ -64,7 +64,7 @@ void LLMortician::die()
 	else if (!mIsDead)
 	{
 		mIsDead = TRUE;
-		gGraveyard.push_back(this);
+		sGraveyard.push_back(this);
 	}
 }