From 7ed419217fc63f7a01c13a7c3320e97edd6bb1b6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 May 2011 23:22:27 +0100
Subject: add test for rezzing an object from a prim item
---
OpenSim/Region/Framework/Scenes/Scene.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9df7340..0722cee 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1971,8 +1971,9 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Add a newly created object to the scene.
///
- ///
+ ///
/// This method does not send updates to the client - callers need to handle this themselves.
+ ///
///
///
/// Position of the object
--
cgit v1.1
From 91a9f30b1613fba8c3ff31de5b9390b0e636ad65 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 May 2011 23:34:34 +0100
Subject: implement Scene.GetSceneObjectGroup(UUID fullID) using existing index
---
OpenSim/Region/Framework/Scenes/Scene.cs | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0722cee..f718331 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4279,6 +4279,16 @@ namespace OpenSim.Region.Framework.Scenes
// }
///
+ /// Get a group via its UUID
+ ///
+ ///
+ ///
+ public SceneObjectGroup GetSceneObjectGroup(UUID fullID)
+ {
+ return m_sceneGraph.GetSceneObjectGroup(fullID);
+ }
+
+ ///
/// Get a named prim contained in this scene (will return the first
/// found, if there are more than one prim with the same name)
///
--
cgit v1.1
From 4b0fc4faef657cc819dfa360fb6a266532724455 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 20 May 2011 23:41:14 +0100
Subject: implement Scene.GetSceneObjectGroup(string name) to match the
equivalent GetSOP method
---
OpenSim/Region/Framework/Scenes/Scene.cs | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f718331..cfb3a5d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4282,14 +4282,25 @@ namespace OpenSim.Region.Framework.Scenes
/// Get a group via its UUID
///
///
- ///
+ /// null if no group with that name exists
public SceneObjectGroup GetSceneObjectGroup(UUID fullID)
{
return m_sceneGraph.GetSceneObjectGroup(fullID);
}
///
- /// Get a named prim contained in this scene (will return the first
+ /// Get a group by name from the scene (will return the first
+ /// found, if there are more than one prim with the same name)
+ ///
+ ///
+ /// null if no group with that name exists
+ public SceneObjectGroup GetSceneObjectGroup(string name)
+ {
+ return m_sceneGraph.GetSceneObjectGroup(name);
+ }
+
+ ///
+ /// Get a prim by name from the scene (will return the first
/// found, if there are more than one prim with the same name)
///
///
--
cgit v1.1
From 90567a9eaac717ab86316c078e148f8fe13432ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 21 May 2011 00:02:53 +0100
Subject: refactor Scene.RezObject() to use AddNewSceneObject() rather than
copy/pasting code with small differences
---
OpenSim/Region/Framework/Scenes/Scene.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index cfb3a5d..b9690fe 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1976,12 +1976,12 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- /// Position of the object
- /// Rotation of the object
+ /// Position of the object. If null then the position stored in the object is used.
+ /// Rotation of the object. If null then the rotation stored in the object is used.
/// Velocity of the object. This parameter only has an effect if the object is physical
///
public bool AddNewSceneObject(
- SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel)
+ SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel)
{
if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel))
{
--
cgit v1.1