diff options
author | Justin Clark-Casey (justincc) | 2011-09-01 23:37:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-01 23:37:03 +0100 |
commit | cc8897127b30b90bae1adfe7d6968974540cc669 (patch) | |
tree | 8531dce7bcdb1daafb6453d9a20911561cb778a7 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | refactor: Move sanity checks to the top of IAM.RezObject() to make the code m... (diff) | |
download | opensim-SC_OLD-cc8897127b30b90bae1adfe7d6968974540cc669.zip opensim-SC_OLD-cc8897127b30b90bae1adfe7d6968974540cc669.tar.gz opensim-SC_OLD-cc8897127b30b90bae1adfe7d6968974540cc669.tar.bz2 opensim-SC_OLD-cc8897127b30b90bae1adfe7d6968974540cc669.tar.xz |
remove the pointless m_Scene.GetNewRezLocation() call at the top of IAM.RezObject() since its always recalculated later on anyway
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 5778dff..9cad003 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -693,12 +693,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
693 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) | 693 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) |
694 | { | 694 | { |
695 | // m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID); | 695 | // m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID); |
696 | |||
697 | byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0); | ||
698 | Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f); | ||
699 | Vector3 pos = m_Scene.GetNewRezLocation( | ||
700 | RayStart, RayEnd, RayTargetID, Quaternion.Identity, | ||
701 | BypassRayCast, bRayEndIsIntersection, true, scale, false); | ||
702 | 696 | ||
703 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 697 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
704 | item = m_Scene.InventoryService.GetItem(item); | 698 | item = m_Scene.InventoryService.GetItem(item); |
@@ -731,7 +725,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
731 | // item that it came from. This allows us to enable 'save object to inventory' | 725 | // item that it came from. This allows us to enable 'save object to inventory' |
732 | if (!m_Scene.Permissions.BypassPermissions()) | 726 | if (!m_Scene.Permissions.BypassPermissions()) |
733 | { | 727 | { |
734 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy && (item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0) | 728 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) |
729 | == (uint)PermissionMask.Copy && (item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0) | ||
735 | { | 730 | { |
736 | itemId = item.ID; | 731 | itemId = item.ID; |
737 | } | 732 | } |
@@ -749,6 +744,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
749 | List<SceneObjectGroup> objlist = | 744 | List<SceneObjectGroup> objlist = |
750 | new List<SceneObjectGroup>(); | 745 | new List<SceneObjectGroup>(); |
751 | List<Vector3> veclist = new List<Vector3>(); | 746 | List<Vector3> veclist = new List<Vector3>(); |
747 | byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0); | ||
748 | Vector3 pos; | ||
752 | 749 | ||
753 | XmlDocument doc = new XmlDocument(); | 750 | XmlDocument doc = new XmlDocument(); |
754 | doc.LoadXml(xmlData); | 751 | doc.LoadXml(xmlData); |