diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 313a469..1d2092e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2014,16 +2014,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
2014 | /// <summary> | 2014 | /// <summary> |
2015 | /// Add a newly created object to the scene. | 2015 | /// Add a newly created object to the scene. |
2016 | /// </summary> | 2016 | /// </summary> |
2017 | /// | 2017 | /// <remarks> |
2018 | /// This method does not send updates to the client - callers need to handle this themselves. | 2018 | /// This method does not send updates to the client - callers need to handle this themselves. |
2019 | /// </remarks> | ||
2019 | /// <param name="sceneObject"></param> | 2020 | /// <param name="sceneObject"></param> |
2020 | /// <param name="attachToBackup"></param> | 2021 | /// <param name="attachToBackup"></param> |
2021 | /// <param name="pos">Position of the object</param> | 2022 | /// <param name="pos">Position of the object. If null then the position stored in the object is used.</param> |
2022 | /// <param name="rot">Rotation of the object</param> | 2023 | /// <param name="rot">Rotation of the object. If null then the rotation stored in the object is used.</param> |
2023 | /// <param name="vel">Velocity of the object. This parameter only has an effect if the object is physical</param> | 2024 | /// <param name="vel">Velocity of the object. This parameter only has an effect if the object is physical</param> |
2024 | /// <returns></returns> | 2025 | /// <returns></returns> |
2025 | public bool AddNewSceneObject( | 2026 | public bool AddNewSceneObject( |
2026 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) | 2027 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel) |
2027 | { | 2028 | { |
2028 | if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel)) | 2029 | if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel)) |
2029 | { | 2030 | { |
@@ -4436,7 +4437,28 @@ namespace OpenSim.Region.Framework.Scenes | |||
4436 | // } | 4437 | // } |
4437 | 4438 | ||
4438 | /// <summary> | 4439 | /// <summary> |
4439 | /// Get a named prim contained in this scene (will return the first | 4440 | /// Get a group via its UUID |
4441 | /// </summary> | ||
4442 | /// <param name="fullID"></param> | ||
4443 | /// <returns>null if no group with that name exists</returns> | ||
4444 | public SceneObjectGroup GetSceneObjectGroup(UUID fullID) | ||
4445 | { | ||
4446 | return m_sceneGraph.GetSceneObjectGroup(fullID); | ||
4447 | } | ||
4448 | |||
4449 | /// <summary> | ||
4450 | /// Get a group by name from the scene (will return the first | ||
4451 | /// found, if there are more than one prim with the same name) | ||
4452 | /// </summary> | ||
4453 | /// <param name="name"></param> | ||
4454 | /// <returns>null if no group with that name exists</returns> | ||
4455 | public SceneObjectGroup GetSceneObjectGroup(string name) | ||
4456 | { | ||
4457 | return m_sceneGraph.GetSceneObjectGroup(name); | ||
4458 | } | ||
4459 | |||
4460 | /// <summary> | ||
4461 | /// Get a prim by name from the scene (will return the first | ||
4440 | /// found, if there are more than one prim with the same name) | 4462 | /// found, if there are more than one prim with the same name) |
4441 | /// </summary> | 4463 | /// </summary> |
4442 | /// <param name="name"></param> | 4464 | /// <param name="name"></param> |