diff options
| author | UbitUmarov | 2017-07-16 05:19:27 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-07-16 05:19:27 +0100 |
| commit | 9ae26fc5afc96c793186b79e80ac8f1a8a040d5b (patch) | |
| tree | 450546e149c8620d422728056f5f0faf820c9c6a /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | ode does not like null refs (diff) | |
| download | opensim-SC-9ae26fc5afc96c793186b79e80ac8f1a8a040d5b.zip opensim-SC-9ae26fc5afc96c793186b79e80ac8f1a8a040d5b.tar.gz opensim-SC-9ae26fc5afc96c793186b79e80ac8f1a8a040d5b.tar.bz2 opensim-SC-9ae26fc5afc96c793186b79e80ac8f1a8a040d5b.tar.xz | |
store kfm on inventory. this may still be a bit confusing on rez
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 6f46a92..19449b1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -657,6 +657,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 657 | } | 657 | } |
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | if(!m_scene.IsRunning) | ||
| 661 | return sog; | ||
| 662 | |||
| 660 | if (root.KeyframeMotion != null) | 663 | if (root.KeyframeMotion != null) |
| 661 | root.KeyframeMotion.StartCrossingCheck(); | 664 | root.KeyframeMotion.StartCrossingCheck(); |
| 662 | 665 | ||