aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/MapImage
diff options
context:
space:
mode:
authorUbitUmarov2015-09-08 15:03:22 +0100
committerUbitUmarov2015-09-08 15:03:22 +0100
commit5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch)
tree03077685e44648264523e1851cd068d51a507e81 /OpenSim/Services/Connectors/MapImage
parent add script events per sec stat, using the time report code, but ignoring the... (diff)
parentMore 'everything is a module' merging. (diff)
downloadopensim-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/Services/Connectors/MapImage')
-rw-r--r--OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
index a0ac5f9..84c4efe 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs
@@ -35,7 +35,7 @@ using System.Reflection;
35using Nini.Config; 35using Nini.Config;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Framework.Communications; 38
39using OpenSim.Framework.ServiceAuth; 39using OpenSim.Framework.ServiceAuth;
40using OpenSim.Server.Base; 40using OpenSim.Server.Base;
41using OpenSim.Services.Interfaces; 41using OpenSim.Services.Interfaces;