Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[VarRegions] Permanently guard against Issue 1125 sneaking back in, as best we can.

Browse Source
This commit is contained in:
Inusaito Sayori
2013-09-29 11:14:57 -04:00
parent da0a092d42
commit aa14bcc754
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llslurl.cpp
View File

@@ -35,6 +35,7 @@
#include "llfiltersd2xmlrpc.h"
#include "curl/curl.h"
#include "hippogridmanager.h"
#include "llworldmap.h" // Variable size regions
const char* LLSLURL::SLURL_HTTP_SCHEME = "http";
const char* LLSLURL::SLURL_HTTPS_SCHEME = "https";
@@ -377,10 +378,14 @@ LLSLURL::LLSLURL(const std::string& grid,
const LLVector3d& global_position)
{
HippoGridInfo* gridp = gHippoGridManager->getGrid(grid);
LLVector3 pos(global_position);
if (LLSimInfo* sim = LLWorldMap::getInstance()->simInfoFromPosGlobal(global_position)) // Variable size regions, we need to fmod against their proper dimensions, not 256
{
pos[VX] = fmod(pos[VX], sim->getSizeX());
pos[VY] = fmod(pos[VY], sim->getSizeY());
}
*this = LLSLURL(gridp ? gridp->getGridNick() : gHippoGridManager->getDefaultGridNick(),
region, LLVector3(global_position.mdV[VX],
global_position.mdV[VY],
global_position.mdV[VZ]));
region, pos);
}
// create a slurl from a global position