From d59715d6f1028f86827f1bd7b43c29abe697fcc9 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 3 Jul 2012 05:48:54 -0400
Subject: PATH-802: fixed check for different grid in chat SLURLS
---
indra/newview/llurldispatcher.cpp | 4 ++--
indra/newview/llviewernetwork.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
(limited to 'indra/newview')
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 802badd494..3fc5492952 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
--
cgit v1.2.3