diff options
| author | Melanie | 2012-08-25 18:08:10 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-25 18:08:10 +0100 |
| commit | 007a45aa76af0029a43b634a0a44a48f15ea5654 (patch) | |
| tree | 5a5202f11b7b54953ea462d70a25dec77502f5eb /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ca... (diff) | |
| download | opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.zip opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.gz opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.bz2 opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.xz | |
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index fa66858..c4b7b27 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -342,7 +342,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 342 | public bool AddNewSceneObject( | 342 | public bool AddNewSceneObject( |
| 343 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel) | 343 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel) |
| 344 | { | 344 | { |
| 345 | AddNewSceneObject(sceneObject, true, false); | 345 | AddNewSceneObject(sceneObject, attachToBackup, false); |
| 346 | 346 | ||
| 347 | if (pos != null) | 347 | if (pos != null) |
| 348 | sceneObject.AbsolutePosition = (Vector3)pos; | 348 | sceneObject.AbsolutePosition = (Vector3)pos; |