From b4a91f5dde928154675da227ae70444bdc12a8bc Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 19 Nov 2014 16:43:56 +0000 Subject: return bbox and offsetHeight to RezObject --- OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 2fa9139..b9f3f94 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -871,7 +871,7 @@ namespace OpenSim.Region.Framework.Scenes return items; } - public bool GetRezReadySceneObjects(TaskInventoryItem item, out List objlist, out List veclist) + public bool GetRezReadySceneObjects(TaskInventoryItem item, out List objlist, out List veclist, out Vector3 bbox, out float offsetHeight) { AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); @@ -882,12 +882,11 @@ namespace OpenSim.Region.Framework.Scenes item.AssetID, item.Name, m_part.Name); objlist = null; veclist = null; + bbox = Vector3.Zero; + offsetHeight = 0; return false; } - - Vector3 bbox; - float offsetHeight; - + bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight); for (int i = 0; i < objlist.Count; i++) -- cgit v1.1