1 files changed, 7 insertions, 2 deletions

diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 621ab1d..c03ef6e 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -12,12 +12,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,
@@ -770,6 +770,7 @@ void LLWorld::printPacketsLost()
 
 void LLWorld::processCoarseUpdate(LLMessageSystem* msg, void** user_data)
 {
+        if(!gWorldp) return;
         LLViewerRegion* region = gWorldp->getRegion(msg->getSender());
         if( region )
         {
@@ -1026,6 +1027,7 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
 
         // Viewer trusts the simulator.
         msg->enableCircuit(sim, TRUE);
+        if(!gWorldp) return;
         gWorldp->addRegion(handle, sim);
 
         // give the simulator a message it can use to get ip and port
@@ -1063,6 +1065,7 @@ public:
 
                 LLHost sim(input["body"]["sim-ip-and-port"].asString());
         
+                if(!gWorldp) return;
                 LLViewerRegion* regionp = gWorldp->getRegion(sim);
                 if (!regionp)
                 {
@@ -1081,6 +1084,7 @@ void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data)
         LLHost host = mesgsys->getSender();
 
         //llinfos << "Disabling simulator with message from " << host << llendl;
+        if(!gWorldp) return;
         gWorldp->removeRegion(host);
 
         mesgsys->disableCircuit(host);
@@ -1090,6 +1094,7 @@ void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data)
 void process_region_handshake(LLMessageSystem* msg, void** user_data)
 {
         LLHost host = msg->getSender();
+        if(!gWorldp) return;
         LLViewerRegion* regionp = gWorldp->getRegion(host);
         if (!regionp)
         {