diff options
| author | Melanie | 2011-05-05 09:49:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-05 09:49:10 +0100 |
| commit | 4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c (patch) | |
| tree | 24e24cb7b424df74b13788d28be9d7588fbd99d0 /OpenSim/Services/LLLoginService | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Test m_Enabled on RemoveRegion. (diff) | |
| download | opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.zip opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.gz opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.bz2 opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/LLLoginService')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 2ffcaf7..f8868f5 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
| @@ -32,7 +32,6 @@ using System.Net; | |||
| 32 | using System.Reflection; | 32 | using System.Reflection; |
| 33 | 33 | ||
| 34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
| 35 | using OpenSim.Framework.Capabilities; | ||
| 36 | using OpenSim.Services.Interfaces; | 35 | using OpenSim.Services.Interfaces; |
| 37 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 36 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
| 38 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; | 37 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 250f8f1..ffed15e 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -38,7 +38,6 @@ using Nini.Config; | |||
| 38 | using OpenMetaverse; | 38 | using OpenMetaverse; |
| 39 | 39 | ||
| 40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
| 41 | using OpenSim.Framework.Capabilities; | ||
| 42 | using OpenSim.Framework.Console; | 41 | using OpenSim.Framework.Console; |
| 43 | using OpenSim.Server.Base; | 42 | using OpenSim.Server.Base; |
| 44 | using OpenSim.Services.Interfaces; | 43 | using OpenSim.Services.Interfaces; |