diff options
| author | BlueWall | 2012-10-09 06:44:14 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-09 06:44:14 -0400 |
| commit | 252af020b05f386f88174cdd28191e0efbeba626 (patch) | |
| tree | f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |
| parent | Added parts to manage repositories and plugin management (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/ServerMain.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 36c84c7..b4811da 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
| @@ -31,6 +31,7 @@ using System.Reflection; | |||
| 31 | 31 | ||
| 32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| 33 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
| 34 | using OpenSim.Region.ClientStack.LindenUDP; | ||
| 34 | using OpenSim.Region.Framework; | 35 | using OpenSim.Region.Framework; |
| 35 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
| 36 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |