diff options
| author | Melanie Thielker | 2014-11-21 04:10:38 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2014-11-21 04:10:38 +0100 |
| commit | 3a94e20d701108ae6670a3960eac50db37d88773 (patch) | |
| tree | 00a11057e80211fee71b34ef25774af05409a6fd /OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |
| parent | Remove braindead "fix" that messed up intersim scripted giving. (diff) | |
| parent | fix stopMoveToTarget in attachments case ( similar to core fix) (diff) | |
| download | opensim-SC-3a94e20d701108ae6670a3960eac50db37d88773.zip opensim-SC-3a94e20d701108ae6670a3960eac50db37d88773.tar.gz opensim-SC-3a94e20d701108ae6670a3960eac50db37d88773.tar.bz2 opensim-SC-3a94e20d701108ae6670a3960eac50db37d88773.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index eba881f..b85fd8b 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
| @@ -246,7 +246,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 246 | /// <param name="objlist">The scene objects</param> | 246 | /// <param name="objlist">The scene objects</param> |
| 247 | /// <param name="veclist">Relative offsets for each object</param> | 247 | /// <param name="veclist">Relative offsets for each object</param> |
| 248 | /// <returns>true = success, false = the scene object asset couldn't be found</returns> | 248 | /// <returns>true = success, false = the scene object asset couldn't be found</returns> |
| 249 | bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist); | 249 | bool GetRezReadySceneObjects(TaskInventoryItem item, out List<SceneObjectGroup> objlist, out List<Vector3> veclist, out Vector3 bbox, out float offsetHeight); |
| 250 | 250 | ||
| 251 | /// <summary> | 251 | /// <summary> |
| 252 | /// Update an existing inventory item. | 252 | /// Update an existing inventory item. |