diff options
| author | Justin Clark-Casey (justincc) | 2013-06-13 00:33:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-13 00:33:53 +0100 |
| commit | 6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0 (patch) | |
| tree | aafda20929365322270aa021d776f93726e17911 /OpenSim/Data/MySQL/MySQLSimulationData.cs | |
| parent | Make XInventoryServicesConnector properly handle a RESULT = false return for ... (diff) | |
| parent | * This fixes having to select and deselect prim to get keyframemotion to star... (diff) | |
| download | opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.zip opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.tar.gz opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.tar.bz2 opensim-SC-6b8e94864a2eb3d5f400aaac59d2ff5b62fae1a0.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 448962a..de52623 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -457,8 +457,6 @@ namespace OpenSim.Data.MySQL | |||
| 457 | if (prim.ParentUUID == UUID.Zero) | 457 | if (prim.ParentUUID == UUID.Zero) |
| 458 | { | 458 | { |
| 459 | objects[prim.UUID] = new SceneObjectGroup(prim); | 459 | objects[prim.UUID] = new SceneObjectGroup(prim); |
| 460 | if (prim.KeyframeMotion != null) | ||
| 461 | prim.KeyframeMotion.UpdateSceneObject(objects[prim.UUID]); | ||
| 462 | } | 460 | } |
| 463 | } | 461 | } |
| 464 | 462 | ||