1 files changed, 8 insertions, 8 deletions

diff --git a/linden/indra/llcommon/llmortician.cpp b/linden/indra/llcommon/llmortician.cpp
index 9341dc1..4d449ff 100644
--- a/linden/indra/llcommon/llmortician.cpp
+++ b/linden/indra/llcommon/llmortician.cpp
@@ -11,12 +11,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -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);
         }
 }