aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer/UserManager.cs
diff options
context:
space:
mode:
authormingchen2007-06-27 18:04:07 +0000
committermingchen2007-06-27 18:04:07 +0000
commit2261e4ec2a43a56dbb74168a169f39b2c6c1f054 (patch)
tree41c46ae07beb837ac109228a0a3731a10b422296 /OpenSim/Grid/UserServer/UserManager.cs
parent*More compile fixes (should be it on OpenSim.sln) (diff)
downloadopensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.zip
opensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.gz
opensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.bz2
opensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.xz
*Fixed all renaming for OpenGridServices.sln, still a reference issue in prebuild.xml though
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 0704de1..c99cf87 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using OpenGrid.Framework.Data; 32using OpenSim.Framework.Data;
33using libsecondlife; 33using libsecondlife;
34using System.Reflection; 34using System.Reflection;
35 35
@@ -38,11 +38,12 @@ using Nwc.XmlRpc;
38using OpenSim.Framework.Sims; 38using OpenSim.Framework.Sims;
39using OpenSim.Framework.Inventory; 39using OpenSim.Framework.Inventory;
40using OpenSim.Framework.Utilities; 40using OpenSim.Framework.Utilities;
41using OpenGrid.Framework.UserManagement; 41
42using OpenSim.Framework.UserManagement;
42 43
43using System.Security.Cryptography; 44using System.Security.Cryptography;
44 45
45namespace OpenGridServices.UserServer 46namespace OpenSim.Grid.UserServer
46{ 47{
47 public class UserManager : UserManagerBase 48 public class UserManager : UserManagerBase
48 { 49 {