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/ApplicationPlugins/RemoteController/RemoteAdminPlugin.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 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 9664433..bae1582 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -42,7 +42,6 @@ using OpenMetaverse; | |||
42 | using Mono.Addins; | 42 | using Mono.Addins; |
43 | using OpenSim; | 43 | using OpenSim; |
44 | using OpenSim.Framework; | 44 | using OpenSim.Framework; |
45 | using OpenSim.Framework.Communications; | ||
46 | using OpenSim.Framework.Console; | 45 | using OpenSim.Framework.Console; |
47 | using OpenSim.Framework.Servers; | 46 | using OpenSim.Framework.Servers; |
48 | using OpenSim.Framework.Servers.HttpServer; | 47 | using OpenSim.Framework.Servers.HttpServer; |