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

return bbox and offsetHeight to RezObject

avinationmerge
UbitUmarov 2014-11-19 16:43:56 +00:00
parent 07074d068b
commit b4a91f5dde
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
View File

@ -246,7 +246,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="objlist">The scene objects</param> /// <param name="objlist">The scene objects</param>
/// <param name="veclist">Relative offsets for each object</param> /// <param name="veclist">Relative offsets for each object</param>
/// <returns>true = success, false = the scene object asset couldn't be found</returns> /// <returns>true = success, false = the scene object asset couldn't be found</returns>
bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist); bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist, out Vector3 bbox, out float offsetHeight);
/// <summary> /// <summary>
/// Update an existing inventory item. /// Update an existing inventory item.

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

@ -2470,8 +2470,10 @@ namespace OpenSim.Region.Framework.Scenes
List<SceneObjectGroup> objlist; List<SceneObjectGroup> objlist;
List<Vector3> veclist; List<Vector3> veclist;
Vector3 bbox;
float offsetHeight;
bool success = sourcePart.Inventory.GetRezReadySceneObjects(item, out objlist, out veclist); bool success = sourcePart.Inventory.GetRezReadySceneObjects(item, out objlist, out veclist,out bbox, out offsetHeight);
if (!success) if (!success)
return null; return null;

7
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -871,7 +871,7 @@ namespace OpenSim.Region.Framework.Scenes
return items; return items;
} }
public bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist) public bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist, out Vector3 bbox, out float offsetHeight)
{ {
AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); 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); item.AssetID, item.Name, m_part.Name);
objlist = null; objlist = null;
veclist = null; veclist = null;
bbox = Vector3.Zero;
offsetHeight = 0;
return false; return false;
} }
Vector3 bbox;
float offsetHeight;
bool single = m_part.ParentGroup.Scene.GetObjectsToRez(rezAsset.Data, false, out objlist, out veclist, out bbox, out 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++) for (int i = 0; i < objlist.Count; i++)