diff options
author | Adam Frisby | 2007-05-20 16:26:12 +0000 |
---|---|---|
committer | Adam Frisby | 2007-05-20 16:26:12 +0000 |
commit | 65d13e7cd11efa65c5b3a2c3577855a37f92a85a (patch) | |
tree | e9ce8e7572388fd442c515cb25ac2a037555cc15 | |
parent | Infact, so fresh it didnt even load a database connection! (diff) | |
download | opensim-SC_OLD-65d13e7cd11efa65c5b3a2c3577855a37f92a85a.zip opensim-SC_OLD-65d13e7cd11efa65c5b3a2c3577855a37f92a85a.tar.gz opensim-SC_OLD-65d13e7cd11efa65c5b3a2c3577855a37f92a85a.tar.bz2 opensim-SC_OLD-65d13e7cd11efa65c5b3a2c3577855a37f92a85a.tar.xz |
* DB4o support made default
* Some comments
-rw-r--r-- | OpenGridServices.UserServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenGridServices.UserServer/UserManager.cs | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs index 94d047b..e965e5d 100644 --- a/OpenGridServices.UserServer/Main.cs +++ b/OpenGridServices.UserServer/Main.cs | |||
@@ -94,7 +94,7 @@ namespace OpenGridServices.UserServer | |||
94 | MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection"); | 94 | MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection"); |
95 | m_userManager = new UserManager(); | 95 | m_userManager = new UserManager(); |
96 | m_userManager._config = Cfg; | 96 | m_userManager._config = Cfg; |
97 | m_userManager.AddPlugin("OpenGrid.Framework.Data.MySQL.dll"); | 97 | m_userManager.AddPlugin("OpenGrid.Framework.Data.DB4o.dll"); |
98 | 98 | ||
99 | MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); | 99 | MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); |
100 | BaseHttpServer httpServer = new BaseHttpServer(8002); | 100 | BaseHttpServer httpServer = new BaseHttpServer(8002); |
diff --git a/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices.UserServer/UserManager.cs index b93c26f..c1e442f 100644 --- a/OpenGridServices.UserServer/UserManager.cs +++ b/OpenGridServices.UserServer/UserManager.cs | |||
@@ -52,6 +52,11 @@ namespace OpenGridServices.UserServer | |||
52 | pluginAssembly = null; | 52 | pluginAssembly = null; |
53 | } | 53 | } |
54 | 54 | ||
55 | /// <summary> | ||
56 | /// Loads a user profile from a database by UUID | ||
57 | /// </summary> | ||
58 | /// <param name="uuid">The target UUID</param> | ||
59 | /// <returns>A user profile</returns> | ||
55 | public UserProfileData getUserProfile(LLUUID uuid) | 60 | public UserProfileData getUserProfile(LLUUID uuid) |
56 | { | 61 | { |
57 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 62 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
@@ -71,6 +76,12 @@ namespace OpenGridServices.UserServer | |||
71 | return null; | 76 | return null; |
72 | } | 77 | } |
73 | 78 | ||
79 | |||
80 | /// <summary> | ||
81 | /// Loads a user profile by name | ||
82 | /// </summary> | ||
83 | /// <param name="name">The target name</param> | ||
84 | /// <returns>A user profile</returns> | ||
74 | public UserProfileData getUserProfile(string name) | 85 | public UserProfileData getUserProfile(string name) |
75 | { | 86 | { |
76 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 87 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |
@@ -90,6 +101,12 @@ namespace OpenGridServices.UserServer | |||
90 | return null; | 101 | return null; |
91 | } | 102 | } |
92 | 103 | ||
104 | /// <summary> | ||
105 | /// Loads a user profile by name | ||
106 | /// </summary> | ||
107 | /// <param name="fname">First name</param> | ||
108 | /// <param name="lname">Last name</param> | ||
109 | /// <returns>A user profile</returns> | ||
93 | public UserProfileData getUserProfile(string fname, string lname) | 110 | public UserProfileData getUserProfile(string fname, string lname) |
94 | { | 111 | { |
95 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) | 112 | foreach (KeyValuePair<string, IUserData> plugin in _plugins) |