diff options
| author | UbitUmarov | 2015-09-08 15:03:22 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-08 15:03:22 +0100 |
| commit | 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch) | |
| tree | 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |
| parent | add script events per sec stat, using the time report code, but ignoring the... (diff) | |
| parent | More 'everything is a module' merging. (diff) | |
| download | opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz | |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index c00190a..cdd8d2d 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
| @@ -36,7 +36,7 @@ using System.Threading; | |||
| 36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
| 37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
| 38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
| 39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 40 | using OpenSim.Region.Framework.Scenes.Serialization; | 40 | using OpenSim.Region.Framework.Scenes.Serialization; |
| 41 | using System.Runtime.Serialization.Formatters.Binary; | 41 | using System.Runtime.Serialization.Formatters.Binary; |
| 42 | using System.Runtime.Serialization; | 42 | using System.Runtime.Serialization; |