diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llurldispatcher.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewernetwork.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index f514254f8f..00b15a5f26 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 8c4990f8fe..3f56103b2e 100644 --- a/indra/newview/llviewernetwork.h +++ b/indra/newview/llviewernetwork.h @@ -199,9 +199,6 @@ class LLGridManager : public LLSingleton<LLGridManager> bool addGrid(LLSD& grid_info); ///< @returns true if successfully added - /// 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 |