OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some stupid math and checks on --bounding-origin and --bounding-size. Bounding origin can of course be negative if it needs to be as we're taking stuff from the (possibly rotated) source region. Bounding size must always be >=0 and <= destination region size. 

Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
LSLKeyTest
Jak Daniels 2015-11-22 16:02:00 +00:00 committed by UbitUmarov
parent f75d113230
commit 15af6265a1
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -224,44 +224,33 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (options.ContainsKey("bounding-origin")) if (options.ContainsKey("bounding-origin"))
{ {
Vector3 boOption = (Vector3)options["bounding-origin"]; Vector3 boOption = (Vector3)options["bounding-origin"];
if (boOption.X >= 0 && boOption.X < m_boundingSize.X if (boOption != m_boundingOrigin)
&& boOption.Y >= 0 && boOption.Y < m_boundingSize.Y
&& boOption.Z >= 0 && boOption.Z < m_boundingSize.Z)
{
if (m_boundingOrigin != boOption)
{ {
m_boundingOrigin = boOption; m_boundingOrigin = boOption;
m_boundingBox = true; m_boundingBox = true;
} }
} }
else m_log.InfoFormat("[ARCHIVER]: The bounding cube origin must be within the destination region! Setting to {0}.", m_boundingOrigin.ToString());
}
if (options.ContainsKey("bounding-size")) if (options.ContainsKey("bounding-size"))
{ {
Vector3 bsOption = (Vector3)options["bounding-size"]; Vector3 bsOption = (Vector3)options["bounding-size"];
bool clip = false; bool clip = false;
if (bsOption.X <= 0 && bsOption.X > (m_boundingSize.X - m_boundingOrigin.X)) if (bsOption.X <= 0 || bsOption.X > m_boundingSize.X)
{ {
bsOption.X = m_boundingSize.X - m_boundingOrigin.X; bsOption.X = m_boundingSize.X;
clip = true; clip = true;
} }
if (bsOption.Y <= 0 && bsOption.Y > (m_boundingSize.Y - m_boundingOrigin.Y)) if (bsOption.Y <= 0 || bsOption.Y > m_boundingSize.Y)
{ {
bsOption.Y = m_boundingSize.Y - m_boundingOrigin.Y; bsOption.Y = m_boundingSize.Y;
clip = true; clip = true;
} }
if (bsOption.Z <= 0 && bsOption.Z > (m_boundingSize.Z - m_boundingOrigin.Z)) if (bsOption != m_boundingSize)
{
bsOption.Z = m_boundingSize.Y - m_boundingOrigin.Z;
clip = true;
}
if (m_boundingSize != bsOption)
{ {
m_boundingSize = bsOption; m_boundingSize = bsOption;
m_boundingBox = true; m_boundingBox = true;
if (clip) m_log.InfoFormat("[ARCHIVER]: The bounding cube specified is larger than the destination region! Clipping to {0}.", m_boundingSize.ToString());
} }
if (clip) m_log.InfoFormat("[ARCHIVER]: The bounding cube specified is larger than the destination region! Clipping to {0}.", m_boundingSize.ToString());
} }
m_debug = options.ContainsKey("debug"); m_debug = options.ContainsKey("debug");