diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index f514254f8ff7318bcf2f8cfc3b3dcf6154447ed0..00b15a5f26e0f4c7f2e0a8cf5857b5b30602a21f 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -205,8 +205,8 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL&
 {
 
   // we can't teleport cross grid at this point
-	if((!LLGridManager::getInstance()->isSystemGrid(slurl.getGrid()) || !LLGridManager::getInstance()->isSystemGrid()) &&
-	   (slurl.getGrid() != LLGridManager::getInstance()->getGrid()))
+	if(   LLGridManager::getInstance()->getGrid(slurl.getGrid())
+	   != LLGridManager::getInstance()->getGrid())
 	{
 		LLSD args;
 		args["SLURL"] = slurl.getLocationString();
diff --git a/indra/newview/llviewernetwork.h b/indra/newview/llviewernetwork.h
index 802badd494abd6f265a52f527fc3d7310e0a5f59..3fc549295227aeba858cccaed74e30bb2c896b9c 100644
--- a/indra/newview/llviewernetwork.h
+++ b/indra/newview/llviewernetwork.h
@@ -198,9 +198,6 @@ class LLGridManager : public LLSingleton<LLGridManager>
 	/// Add a grid to the list of grids
 	void addGrid(LLSD& grid_info);	
 
-	/// find the LLSD definition for a given grid
-	void getGridInfo(const std::string& grid, LLSD &grid_info);
-	
 	void updateIsInProductionGrid();
 
 	// helper function for adding the hard coded grids