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/Presence | |
| 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/Services/Connectors/Presence')
| -rw-r--r-- | OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs index e474d41..1f14b32 100644 --- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs +++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs | |||
| @@ -32,7 +32,7 @@ using System.IO; | |||
| 32 | using System.Reflection; | 32 | using System.Reflection; |
| 33 | using Nini.Config; | 33 | using Nini.Config; |
| 34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
| 35 | using OpenSim.Framework.Communications; | 35 | |
| 36 | using OpenSim.Framework.ServiceAuth; | 36 | using OpenSim.Framework.ServiceAuth; |
| 37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
| 38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |