aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorUbitUmarov2014-11-19 16:43:56 +0000
committerUbitUmarov2014-11-19 16:43:56 +0000
commitb4a91f5dde928154675da227ae70444bdc12a8bc (patch)
treedd2924969c7ebf99a4d4d1b5af5b23a4ec0f1004 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parent dont do recoil on llRezObject called from attachments, as seem to happen (diff)
downloadopensim-SC_OLD-b4a91f5dde928154675da227ae70444bdc12a8bc.zip
opensim-SC_OLD-b4a91f5dde928154675da227ae70444bdc12a8bc.tar.gz
opensim-SC_OLD-b4a91f5dde928154675da227ae70444bdc12a8bc.tar.bz2
opensim-SC_OLD-b4a91f5dde928154675da227ae70444bdc12a8bc.tar.xz
return bbox and offsetHeight to RezObject
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs9
1 files changed, 4 insertions, 5 deletions
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
871 return items; 871 return items;
872 } 872 }
873 873
874 public bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist) 874 public bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist, out Vector3 bbox, out float offsetHeight)
875 { 875 {
876 AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); 876 AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
877 877
@@ -882,12 +882,11 @@ namespace OpenSim.Region.Framework.Scenes
882 item.AssetID, item.Name, m_part.Name); 882 item.AssetID, item.Name, m_part.Name);
883 objlist = null; 883 objlist = null;
884 veclist = null; 884 veclist = null;
885 bbox = Vector3.Zero;
886 offsetHeight = 0;
885 return false; 887 return false;
886 } 888 }
887 889
888 Vector3 bbox;
889 float offsetHeight;
890
891 bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight); 890 bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out offsetHeight);
892 891
893 for (int i = 0; i < objlist.Count; i++) 892 for (int i = 0; i < objlist.Count; i++)