diff options
| author | Melanie | 2013-06-13 02:49:43 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-13 02:49:43 +0100 |
| commit | 9975c5674c002be0e17db02b589c388b684f63a9 (patch) | |
| tree | aa727252685987781696db21f9eee58dd6b6d023 /OpenSim/Data/MySQL | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.zip opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.tar.gz opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.tar.bz2 opensim-SC_OLD-9975c5674c002be0e17db02b589c388b684f63a9.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/MySQL')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 5320543..537ec85 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -458,8 +458,6 @@ namespace OpenSim.Data.MySQL | |||
| 458 | if (prim.ParentUUID == UUID.Zero) | 458 | if (prim.ParentUUID == UUID.Zero) |
| 459 | { | 459 | { |
| 460 | objects[prim.UUID] = new SceneObjectGroup(prim); | 460 | objects[prim.UUID] = new SceneObjectGroup(prim); |
| 461 | if (prim.KeyframeMotion != null) | ||
| 462 | prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]); | ||
| 463 | } | 461 | } |
| 464 | } | 462 | } |
| 465 | 463 | ||