Skip to content
Snippets Groups Projects
Commit d59715d6 authored by Oz Linden's avatar Oz Linden
Browse files

PATH-802: fixed check for different grid in chat SLURLS

parent 4e56af04
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llurldispatcher.cpp
+ 2
− 2
View file @ d59715d6
...@@ -205,8 +205,8 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL& ...@@ -205,8 +205,8 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const LLSLURL&
{ {
// we can't teleport cross grid at this point // we can't teleport cross grid at this point
if((!LLGridManager::getInstance()->isSystemGrid(slurl.getGrid()) || !LLGridManager::getInstance()->isSystemGrid()) && if( LLGridManager::getInstance()->getGrid(slurl.getGrid())
(slurl.getGrid() != LLGridManager::getInstance()->getGrid())) != LLGridManager::getInstance()->getGrid())
{ {
LLSD args; LLSD args;
args["SLURL"] = slurl.getLocationString(); args["SLURL"] = slurl.getLocationString();
......
indra/newview/llviewernetwork.h
+ 0
− 3
View file @ d59715d6
...@@ -198,9 +198,6 @@ class LLGridManager : public LLSingleton<LLGridManager> ...@@ -198,9 +198,6 @@ class LLGridManager : public LLSingleton<LLGridManager>
/// Add a grid to the list of grids /// Add a grid to the list of grids
void addGrid(LLSD& grid_info); void addGrid(LLSD& grid_info);
/// find the LLSD definition for a given grid
void getGridInfo(const std::string& grid, LLSD &grid_info);
void updateIsInProductionGrid(); void updateIsInProductionGrid();
// helper function for adding the hard coded grids // helper function for adding the hard coded grids
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment