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

refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte

bulletsim
Justin Clark-Casey (justincc) 2011-04-12 22:30:43 +01:00
parent 8e0d2cc43b
commit b0889ed92a
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -574,21 +574,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{ {
// m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID); // m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
// Work out position details byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
byte bRayEndIsIntersection = (byte)0;
if (RayEndIsIntersection)
{
bRayEndIsIntersection = (byte)1;
}
else
{
bRayEndIsIntersection = (byte)0;
}
Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f); Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
Vector3 pos = m_Scene.GetNewRezLocation( Vector3 pos = m_Scene.GetNewRezLocation(
RayStart, RayEnd, RayTargetID, Quaternion.Identity, RayStart, RayEnd, RayTargetID, Quaternion.Identity,
BypassRayCast, bRayEndIsIntersection, true, scale, false); BypassRayCast, bRayEndIsIntersection, true, scale, false);

13
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1989,18 +1989,7 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
} }
// Work out position details byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
byte bRayEndIsIntersection = (byte)0;
if (RayEndIsIntersection)
{
bRayEndIsIntersection = (byte)1;
}
else
{
bRayEndIsIntersection = (byte)0;
}
Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f); Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
Vector3 pos Vector3 pos
= GetNewRezLocation( = GetNewRezLocation(