livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-9687: Make slurls in chat work on hypergrid-enabled grids

Cinders 2013-04-08 16:50:29 -06:00
parent 07c60cc62c
commit 9e5b636859
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llurldispatcher.cpp
View File

@ -210,6 +210,8 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, const std::string
// LLURLDispatcherImpl::regionNameCallback,
// slurl.getSLURLString(),
LLSLURL hyper = slurl;
std::string region = hyper.getRegion();
std::string dest = hyper.getSLURLString();
#ifdef OPENSIM // <FS:AW optional opensim support>
std::string grid = slurl.getGrid();
std::string current_grid = LLGridManager::getInstance()->getGrid();
@ -219,7 +221,6 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, const std::string
std::string current = LLGridManager::getInstance()->getGrid();
if((grid != current ) && (!LLGridManager::getInstance()->isInOpenSim() || (!slurl.getHypergrid() && gatekeeper.empty())))
{
std::string dest = hyper.getSLURLString();
if (!dest.empty())
{
LLSD args;
@ -234,11 +235,28 @@ bool LLURLDispatcherImpl::dispatchRegion(const LLSLURL& slurl, const std::string
{
hyper = LLSLURL(gatekeeper + ":" + slurl.getRegion(), slurl.getPosition(), true);
}
// Trim the grid uri if we're talking a local region here. <FS:CR>
if (grid == current)
{
std::size_t pos;
pos = region.find(current);
if (pos != std::string::npos)
{
region.erase(pos, pos + current.length() + 1);
}
pos = dest.find(current);
if (pos != std::string::npos)
{
dest.erase(pos, pos + current.length() + 1);
}
}
#endif //OPENSIM
// </FS:AW optional opensim support>
// Request a region handle by name
LLWorldMapMessage::getInstance()->sendNamedRegionRequest(hyper.getRegion(), LLURLDispatcherImpl::regionNameCallback, hyper.getSLURLString(), LLUI::sSettingGroups["config"]->getBOOL("SLURLTeleportDirectly")); // don't teleport
LLWorldMapMessage::getInstance()->sendNamedRegionRequest(region, LLURLDispatcherImpl::regionNameCallback, dest, LLUI::sSettingGroups["config"]->getBOOL("SLURLTeleportDirectly")); // don't teleport
// </FS:AW optional opensim support>
return true;
}