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/Services/Connectors/Asset | |
| 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/Services/Connectors/Asset')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index a139b9b..8f3cb80 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
| @@ -35,7 +35,6 @@ using System.Timers; | |||
| 35 | using Nini.Config; | 35 | using Nini.Config; |
| 36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
| 37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
| 38 | using OpenSim.Framework.Communications; | ||
| 39 | using OpenSim.Services.Interfaces; | 38 | using OpenSim.Services.Interfaces; |
| 40 | using OpenMetaverse; | 39 | using OpenMetaverse; |
| 41 | 40 | ||