From ca718b6f8d5a76f4f4dcb6625c01c3ec15371bd6 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 28 Mar 2008 19:58:45 +0000
Subject: * Introduced common abstract UserDataBase provider * Weeded out
 multiple AvatarPickerAvatar classes

---
 OpenSim/Framework/Data/GridData.cs     | 13 +------------
 OpenSim/Framework/Data/UserDataBase.cs | 27 +++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'OpenSim/Framework/Data')

diff --git a/OpenSim/Framework/Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
index 5eaa2c4..af51d0d 100644
--- a/OpenSim/Framework/Data/GridData.cs
+++ b/OpenSim/Framework/Data/GridData.cs
@@ -29,18 +29,7 @@ using System.Collections.Generic;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data
-{
-    public class AvatarPickerAvatar
-    {
-        public LLUUID AvatarID;
-        public string firstName;
-        public string lastName;
-
-        public AvatarPickerAvatar()
-        {
-        }
-    }
-
+{  
     public enum DataResponse
     {
         RESPONSE_OK,
diff --git a/OpenSim/Framework/Data/UserDataBase.cs b/OpenSim/Framework/Data/UserDataBase.cs
index a704ed4..7a74693 100644
--- a/OpenSim/Framework/Data/UserDataBase.cs
+++ b/OpenSim/Framework/Data/UserDataBase.cs
@@ -1,10 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
+using libsecondlife;
 
 namespace OpenSim.Framework.Data
 {
-    public abstract class UserDataBase
+    public abstract class UserDataBase : IUserData
     {
+        public abstract UserProfileData GetUserByUUID(LLUUID user);
+        public abstract UserProfileData GetUserByName(string fname, string lname);        
+        public abstract UserAgentData GetAgentByUUID(LLUUID user);
+        public abstract UserAgentData GetAgentByName(string name);
+        public abstract UserAgentData GetAgentByName(string fname, string lname);
+        public abstract void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey);
+        public abstract void AddNewUserProfile(UserProfileData user);
+        public abstract bool UpdateUserProfile(UserProfileData user);
+        public abstract void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid);
+        public abstract void AddNewUserAgent(UserAgentData agent);
+        public abstract void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms);
+        public abstract void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend);
+        public abstract void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms);
+        public abstract List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
+        public abstract bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount);
+        public abstract bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory);
+        public abstract string GetVersion();
+        public abstract string getName();
+        public abstract void Initialise();
+        public abstract List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
     }
 }
-- 
cgit v1.1