diff options
| author | UbitUmarov | 2014-07-16 16:22:32 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-07-16 16:22:32 +0100 |
| commit | 19d33c571d8f48501ecb2409814d5b95b2b4be23 (patch) | |
| tree | 8e08805a71ebea81de75b5805105f325e0defa0f /OpenSim/Data/MySQL | |
| parent | Merge branch 'avination-current' into ubitwork (diff) | |
| parent | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... (diff) | |
| download | opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.zip opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.gz opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.bz2 opensim-SC-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.xz | |
Merge branch 'avination-current' into ubitwork
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 | ||