aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-22 18:15:43 +0000
committerJustin Clarke Casey2009-04-22 18:15:43 +0000
commit2c81e41c8a884ece643f3079349b033d03b6b774 (patch)
treebea7956ef00378f47fa420e82ffb665a137a9630 /OpenSim/Data
parentFrom: Alan Webb <alan_webb@us.ibm.com> (diff)
downloadopensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.zip
opensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.tar.gz
opensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.tar.bz2
opensim-SC_OLD-2c81e41c8a884ece643f3079349b033d03b6b774.tar.xz
* Fission OGS1UserServices into user service and OGS1 user data plugin components
* Make OGS1UserServices inherit from UserManagerBase * This allows grid mode regions to use the same user data plugin infrastructure as grid servers and standalone OpenSims
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/IUserData.cs12
-rw-r--r--OpenSim/Data/UserDataBase.cs2
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Data/IUserData.cs b/OpenSim/Data/IUserData.cs
index 1564033..9ac923f 100644
--- a/OpenSim/Data/IUserData.cs
+++ b/OpenSim/Data/IUserData.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using OpenMetaverse; 30using OpenMetaverse;
30using OpenSim.Framework; 31using OpenSim.Framework;
@@ -48,8 +49,15 @@ namespace OpenSim.Data
48 /// </summary> 49 /// </summary>
49 /// <param name="fname">Account firstname</param> 50 /// <param name="fname">Account firstname</param>
50 /// <param name="lname">Account lastname</param> 51 /// <param name="lname">Account lastname</param>
51 /// <returns>The user data profile</returns> 52 /// <returns>The user data profile. Null if no user is found</returns>
52 UserProfileData GetUserByName(string fname, string lname); 53 UserProfileData GetUserByName(string fname, string lname);
54
55 /// <summary>
56 /// Get a user from a given uri.
57 /// </summary>
58 /// <param name="uri"></param>
59 /// <returns>The user data profile. Null if no user is found.</returns>
60 UserProfileData GetUserByUri(Uri uri);
53 61
54 /// <summary> 62 /// <summary>
55 /// Returns a list of UUIDs firstnames and lastnames that match string query entered into the avatar picker. 63 /// Returns a list of UUIDs firstnames and lastnames that match string query entered into the avatar picker.
@@ -63,7 +71,7 @@ namespace OpenSim.Data
63 /// Returns the current agent for a user searching by it's UUID 71 /// Returns the current agent for a user searching by it's UUID
64 /// </summary> 72 /// </summary>
65 /// <param name="user">The users UUID</param> 73 /// <param name="user">The users UUID</param>
66 /// <returns>The current agent session</returns> 74 /// <returns>The current agent session. Null if no session was found</returns>
67 UserAgentData GetAgentByUUID(UUID user); 75 UserAgentData GetAgentByUUID(UUID user);
68 76
69 /// <summary> 77 /// <summary>
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 0fa9e58..167a837 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using OpenMetaverse; 30using OpenMetaverse;
30using OpenSim.Framework; 31using OpenSim.Framework;
@@ -42,6 +43,7 @@ namespace OpenSim.Data
42 public abstract UserAgentData GetAgentByUUID(UUID user); 43 public abstract UserAgentData GetAgentByUUID(UUID user);
43 public abstract UserAgentData GetAgentByName(string name); 44 public abstract UserAgentData GetAgentByName(string name);
44 public abstract UserAgentData GetAgentByName(string fname, string lname); 45 public abstract UserAgentData GetAgentByName(string fname, string lname);
46 public UserProfileData GetUserByUri(Uri uri) { return null; }
45 public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey); 47 public abstract void StoreWebLoginKey(UUID agentID, UUID webLoginKey);
46 public abstract void AddNewUserProfile(UserProfileData user); 48 public abstract void AddNewUserProfile(UserProfileData user);
47 public abstract bool UpdateUserProfile(UserProfileData user); 49 public abstract bool UpdateUserProfile(UserProfileData user);