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/ScriptEngine | |
| 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_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC_OLD-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz | |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8f4e840..3f523a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -54,7 +54,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 54 | using OpenSim.Region.Framework.Scenes.Serialization; | 54 | using OpenSim.Region.Framework.Scenes.Serialization; |
| 55 | using OpenSim.Region.Framework.Scenes.Animation; | 55 | using OpenSim.Region.Framework.Scenes.Animation; |
| 56 | using OpenSim.Region.Framework.Scenes.Scripting; | 56 | using OpenSim.Region.Framework.Scenes.Scripting; |
| 57 | using OpenSim.Region.Physics.Manager; | 57 | using OpenSim.Region.PhysicsModules.SharedBase; |
| 58 | using OpenSim.Region.ScriptEngine.Shared; | 58 | using OpenSim.Region.ScriptEngine.Shared; |
| 59 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; | 59 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; |
| 60 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 60 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |