From 7b0a6717ce8233cdc20b3549d64aed384c5c7f2d Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Wed, 14 Aug 2013 15:56:38 -0600
Subject: [PATCH] only check for an hg map server if in opensim, also guard
 against a potential crash

---
 indra/newview/llworldmipmap.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llworldmipmap.cpp b/indra/newview/llworldmipmap.cpp
index 1a1850a42e..9c15d07de9 100755
--- a/indra/newview/llworldmipmap.cpp
+++ b/indra/newview/llworldmipmap.cpp
@@ -34,6 +34,7 @@
 
 // <FS:CR> HG maps
 #ifdef OPENSIM
+#include "llviewernetwork.h"
 #include "llviewerregion.h"
 #include "llagent.h"
 #endif // OPENSIM
@@ -190,8 +191,15 @@ LLPointer<LLViewerFetchedTexture> LLWorldMipmap::loadObjectsTile(U32 grid_x, U32
 	// Get the grid coordinates
 // <FS:CR> HG Maps
 #ifdef OPENSIM
-	LLViewerRegion* region = gAgent.getRegion();
-	std::string hg_map = region->getHGMapServerURL();
+	std::string hg_map;
+	if (LLGridManager::getInstance()->isInOpenSim())
+	{
+		LLViewerRegion* region = gAgent.getRegion();
+		if (region)
+		{
+			hg_map = region->getHGMapServerURL();
+		}
+	}
 	std::string imageurl = hg_map.empty() ? gSavedSettings.getString("CurrentMapServerURL") : hg_map;
 	imageurl.append(llformat("map-%d-%d-%d-objects.jpg", level, grid_x, grid_y));
 #else // !OPENSIM