aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-12 22:30:43 +0100
committerJustin Clark-Casey (justincc)2011-04-12 22:30:43 +0100
commitb0889ed92a3c7d152f9b05aec1ce00dfc010e34e (patch)
treed813b4df1c0a5c6786335666d3d57fb3ef22c467 /OpenSim
parentIf an object is rezzed directly from a prim inventory then give it the rotati... (diff)
downloadopensim-SC-b0889ed92a3c7d152f9b05aec1ce00dfc010e34e.zip
opensim-SC-b0889ed92a3c7d152f9b05aec1ce00dfc010e34e.tar.gz
opensim-SC-b0889ed92a3c7d152f9b05aec1ce00dfc010e34e.tar.bz2
opensim-SC-b0889ed92a3c7d152f9b05aec1ce00dfc010e34e.tar.xz
refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs15
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs13
2 files changed, 2 insertions, 26 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index cdee53c..73b0a35 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -574,21 +574,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
574 { 574 {
575// m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID); 575// m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
576 576
577 // Work out position details 577 byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
578 byte bRayEndIsIntersection = (byte)0;
579
580 if (RayEndIsIntersection)
581 {
582 bRayEndIsIntersection = (byte)1;
583 }
584 else
585 {
586 bRayEndIsIntersection = (byte)0;
587 }
588
589 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f); 578 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
590
591
592 Vector3 pos = m_Scene.GetNewRezLocation( 579 Vector3 pos = m_Scene.GetNewRezLocation(
593 RayStart, RayEnd, RayTargetID, Quaternion.Identity, 580 RayStart, RayEnd, RayTargetID, Quaternion.Identity,
594 BypassRayCast, bRayEndIsIntersection, true, scale, false); 581 BypassRayCast, bRayEndIsIntersection, true, scale, false);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 254879b..0f85925 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1989,18 +1989,7 @@ namespace OpenSim.Region.Framework.Scenes
1989 return; 1989 return;
1990 } 1990 }
1991 1991
1992 // Work out position details 1992 byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
1993 byte bRayEndIsIntersection = (byte)0;
1994
1995 if (RayEndIsIntersection)
1996 {
1997 bRayEndIsIntersection = (byte)1;
1998 }
1999 else
2000 {
2001 bRayEndIsIntersection = (byte)0;
2002 }
2003
2004 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f); 1993 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
2005 Vector3 pos 1994 Vector3 pos
2006 = GetNewRezLocation( 1995 = GetNewRezLocation(