diff options
| author | UbitUmarov | 2013-09-19 11:33:38 +0100 |
|---|---|---|
| committer | UbitUmarov | 2013-09-19 11:33:38 +0100 |
| commit | 8ad7f2ce2d1c9197baf72d52ad4c4a818d0bfe43 (patch) | |
| tree | 6b1124f8176b2977f03a067bc04da0266ac9c7c3 /OpenSim/Data/MySQL/MySQLSimulationData.cs | |
| parent | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... (diff) | |
| parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
| download | opensim-SC_OLD-8ad7f2ce2d1c9197baf72d52ad4c4a818d0bfe43.zip opensim-SC_OLD-8ad7f2ce2d1c9197baf72d52ad4c4a818d0bfe43.tar.gz opensim-SC_OLD-8ad7f2ce2d1c9197baf72d52ad4c4a818d0bfe43.tar.bz2 opensim-SC_OLD-8ad7f2ce2d1c9197baf72d52ad4c4a818d0bfe43.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
| -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 | ||