diff options
author | John Hurliman | 2010-09-12 14:21:51 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-12 14:21:51 -0700 |
commit | c03b24cbfdc449cf326cf0f560395753339169dc (patch) | |
tree | d62a666839d3c638b5c9799c70be971a2d6d6c18 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | * Added ISimulationDataService and IEstateDataService (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-c03b24cbfdc449cf326cf0f560395753339169dc.zip opensim-SC-c03b24cbfdc449cf326cf0f560395753339169dc.tar.gz opensim-SC-c03b24cbfdc449cf326cf0f560395753339169dc.tar.bz2 opensim-SC-c03b24cbfdc449cf326cf0f560395753339169dc.tar.xz |
Merged
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index f779a6d..5ac8ff5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -298,7 +298,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
298 | /// <param name="pos">Position of the object</param> | 298 | /// <param name="pos">Position of the object</param> |
299 | /// <param name="rot">Rotation of the object</param> | 299 | /// <param name="rot">Rotation of the object</param> |
300 | /// <param name="vel">Velocity of the object. This parameter only has an effect if the object is physical</param> | 300 | /// <param name="vel">Velocity of the object. This parameter only has an effect if the object is physical</param> |
301 | /// <returns></returns> | 301 | /// <returns></returns> |
302 | public bool AddNewSceneObject( | 302 | public bool AddNewSceneObject( |
303 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) | 303 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) |
304 | { | 304 | { |
@@ -322,7 +322,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
322 | } | 322 | } |
323 | 323 | ||
324 | return true; | 324 | return true; |
325 | } | 325 | } |
326 | 326 | ||
327 | /// <summary> | 327 | /// <summary> |
328 | /// Add an object to the scene. This will both update the scene, and send information about the | 328 | /// Add an object to the scene. This will both update the scene, and send information about the |
@@ -1284,7 +1284,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1284 | SceneObjectGroup group = GetGroupByPrim(localID); | 1284 | SceneObjectGroup group = GetGroupByPrim(localID); |
1285 | 1285 | ||
1286 | if (group != null) | 1286 | if (group != null) |
1287 | { | 1287 | { |
1288 | if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) | 1288 | if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) |
1289 | { | 1289 | { |
1290 | if (m_parentScene.AttachmentsModule != null) | 1290 | if (m_parentScene.AttachmentsModule != null) |