From 044446821b7d1d4550e43b0351c2611026874755 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 22 Jun 2009 12:18:04 +0000
Subject: Committing the meat of the user server interface and the bones of the
 service implementation

---
 OpenSim/Services/AssetService/AssetServiceBase.cs | 22 ++++++-----
 OpenSim/Services/Interfaces/IUserService.cs       | 45 +++++++++++++++++++++++
 OpenSim/Services/UserService/UserService.cs       | 24 ++++++++++++
 3 files changed, 81 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/AssetService/AssetServiceBase.cs b/OpenSim/Services/AssetService/AssetServiceBase.cs
index c42d469..c60dd1f 100644
--- a/OpenSim/Services/AssetService/AssetServiceBase.cs
+++ b/OpenSim/Services/AssetService/AssetServiceBase.cs
@@ -46,23 +46,25 @@ namespace OpenSim.Services.AssetService
             string connString = String.Empty;
 
             //
-            // Try reading the [DatabaseService] section first, if it exists
+            // Try reading the [AssetService] section first, if it exists
             //
-            IConfig dbConfig = config.Configs["DatabaseService"];
-            if (dbConfig != null)
+            IConfig assetConfig = config.Configs["AssetService"];
+            if (assetConfig != null)
             {
-                dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                connString = dbConfig.GetString("ConnectionString", String.Empty);
+                dllName = assetConfig.GetString("StorageProvider", dllName);
+                connString = assetConfig.GetString("ConnectionString", connString);
             }
 
             //
-            // Try reading the more specific [AssetService] section, if it exists
+            // Try reading the [DatabaseService] section, if it exists
             //
-            IConfig assetConfig = config.Configs["AssetService"];
-            if (assetConfig != null)
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
             {
-                dllName = assetConfig.GetString("StorageProvider", dllName);
-                connString = assetConfig.GetString("ConnectionString", connString);
+                if (dllName != String.Empty)
+                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                if (connString != String.Empty)
+                    connString = dbConfig.GetString("ConnectionString", String.Empty);
             }
 
             //
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 051ee9a..823a86d 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -25,9 +25,54 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Collections.Generic;
+using OpenMetaverse;
+
 namespace OpenSim.Services.Interfaces
 {
+    public class UserData
+    {
+        public string FirstName;
+        public string LastName;
+        public UUID UserID;
+        public UUID scopeID;
+
+        // For informational purposes only!
+        //
+        public string HomeRegionName;
+
+        public UUID HomeRegionID;
+        public float HomePositionX;
+        public float HomePositionY;
+        public float HomePositionZ;
+        public float HomeLookAtX;
+        public float HomeLookAtY;
+        public float HomeLookAtZ;
+
+        // There are here because they
+        // concern the account rather than
+        // the profile. They just happen to
+        // be used in the Linden profile as well
+        //
+        public int GodLevel;
+        public int UserFlags;
+        public string AccountType;
+    };
+
     public interface IUserService
     {
+        UserData GetUserData(UUID scopeID, UUID userID);
+        UserData GetUserData(UUID scopeID, string FirstName, string LastName);
+
+        // This will set only the home region portion of the data!
+        // Can't be used to set god level, flags, type or change the name!
+        //
+        bool SetUserData(UserData data);
+        
+        // Returns the list of avatars that matches both the search
+        // criterion and the scope ID passed
+        // ONLY THE NAME, SCOPE ID and UUID will be filled in!
+        //
+        List<UserData> GetAvatarPickerData(UUID scopeID, string query);
     }
 }
diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs
index a725683..3443643 100644
--- a/OpenSim/Services/UserService/UserService.cs
+++ b/OpenSim/Services/UserService/UserService.cs
@@ -30,6 +30,8 @@ using System.Reflection;
 using Nini.Config;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
+using System.Collections.Generic;
+using OpenMetaverse;
 
 namespace OpenSim.Services.UserService
 {
@@ -38,5 +40,27 @@ namespace OpenSim.Services.UserService
         public UserService(IConfigSource config) : base(config)
         {
         }
+
+        public UserData GetUserData(UUID scopeID, string firstName,
+                string lastName)
+        {
+            return null;
+        }
+
+        public UserData GetUserData(UUID scopeID, UUID userID)
+        {
+            return null;
+        }
+
+        public bool SetUserData(UserData data)
+        {
+            return false;
+        }
+
+        public List<UserData> GetAvatarPickerData(UUID scopeID,
+                string query)
+        {
+            return null;
+        }
     }
 }
-- 
cgit v1.1