diff options
| author | UbitUmarov | 2012-02-27 01:31:29 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-02-27 01:31:29 +0000 |
| commit | f451f672131bfa293b9371984435a00c03174ff5 (patch) | |
| tree | d8d85e06b4351d8b175e6353c5f824f8580d7fda /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Merge branch 'ubitwork' (diff) | |
| download | opensim-SC-f451f672131bfa293b9371984435a00c03174ff5.zip opensim-SC-f451f672131bfa293b9371984435a00c03174ff5.tar.gz opensim-SC-f451f672131bfa293b9371984435a00c03174ff5.tar.bz2 opensim-SC-f451f672131bfa293b9371984435a00c03174ff5.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c20da4b..11a41aa 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2421,8 +2421,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2421 | 2421 | ||
| 2422 | if (newPosition != Vector3.Zero) | 2422 | if (newPosition != Vector3.Zero) |
| 2423 | newObject.RootPart.GroupPosition = newPosition; | 2423 | newObject.RootPart.GroupPosition = newPosition; |
| 2424 | if (newObject.KeyframeMotion != null) | 2424 | if (newObject.RootPart.KeyframeMotion != null) |
| 2425 | newObject.KeyframeMotion.UpdateSceneObject(newObject); | 2425 | newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); |
| 2426 | 2426 | ||
| 2427 | if (!AddSceneObject(newObject)) | 2427 | if (!AddSceneObject(newObject)) |
| 2428 | { | 2428 | { |