aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-21 00:02:53 +0100
committerJustin Clark-Casey (justincc)2011-05-21 00:02:53 +0100
commit90567a9eaac717ab86316c078e148f8fe13432ac (patch)
tree3a87213e6a946c25b6a029dbf911b75038b8a070 /OpenSim/Region/Framework/Scenes/Scene.cs
parentrefactor TestRezObjectFromInventoryItem() (diff)
downloadopensim-SC-90567a9eaac717ab86316c078e148f8fe13432ac.zip
opensim-SC-90567a9eaac717ab86316c078e148f8fe13432ac.tar.gz
opensim-SC-90567a9eaac717ab86316c078e148f8fe13432ac.tar.bz2
opensim-SC-90567a9eaac717ab86316c078e148f8fe13432ac.tar.xz
refactor Scene.RezObject() to use AddNewSceneObject() rather than copy/pasting code with small differences
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 3 insertions, 3 deletions
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
1976 /// </remarks> 1976 /// </remarks>
1977 /// <param name="sceneObject"></param> 1977 /// <param name="sceneObject"></param>
1978 /// <param name="attachToBackup"></param> 1978 /// <param name="attachToBackup"></param>
1979 /// <param name="pos">Position of the object</param> 1979 /// <param name="pos">Position of the object. If null then the position stored in the object is used.</param>
1980 /// <param name="rot">Rotation of the object</param> 1980 /// <param name="rot">Rotation of the object. If null then the rotation stored in the object is used.</param>
1981 /// <param name="vel">Velocity of the object. This parameter only has an effect if the object is physical</param> 1981 /// <param name="vel">Velocity of the object. This parameter only has an effect if the object is physical</param>
1982 /// <returns></returns> 1982 /// <returns></returns>
1983 public bool AddNewSceneObject( 1983 public bool AddNewSceneObject(
1984 SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) 1984 SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel)
1985 { 1985 {
1986 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel)) 1986 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel))
1987 { 1987 {