3 files changed, 30 insertions, 8 deletions

diff --git a/OpenSim/Data/IAvatarData.cs b/OpenSim/Data/IAvatarData.cs
index 00decdf..59213da 100644
--- a/OpenSim/Data/IAvatarData.cs
+++ b/OpenSim/Data/IAvatarData.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Data
     // This MUST be a ref type!
     public class AvatarBaseData
     {
-        public string PrincipalID;
+        public UUID PrincipalID;
         public Dictionary<string, string> Data;
     }
 
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs
index 1f5b257..ffcdcc5 100644
--- a/OpenSim/Services/AvatarService/AvatarService.cs
+++ b/OpenSim/Services/AvatarService/AvatarService.cs
@@ -51,27 +51,45 @@ namespace OpenSim.Services.AvatarService
             m_log.Debug("[AVATAR SERVICE]: Starting avatar service");
         }
 
-        public AvatarData GetAvatar(UUID userID)
+        public AvatarData GetAvatar(UUID principalID)
         {
-            return null;
+            
+            AvatarBaseData[] av = m_Database.Get("PrincipalID", principalID.ToString());
+            if (av.Length == 0)
+                return null;
+
+            AvatarData ret = new AvatarData();
+            ret.AvatarType = Convert.ToInt32(av[0].Data["AvatarType"]);
+
+            av[0].Data.Remove("AvatarType");
+
+            ret.Data = av[0].Data;
+
+            return ret;
         }
 
-        public bool SetAvatar(UUID userID, AvatarData avatar)
+        public bool SetAvatar(UUID principalID, AvatarData avatar)
         {
-            return false;
+            AvatarBaseData av = new AvatarBaseData();
+
+            av.PrincipalID = principalID;
+            av.Data = avatar.Data;
+            av.Data["AvatarType"] = avatar.AvatarType.ToString();
+
+            return m_Database.Store(av);
         }
 
-        public bool ResetAvatar(UUID userID)
+        public bool ResetAvatar(UUID principalID)
         {
             return false;
         }
 
-        public bool SetItems(UUID userID, string[] names, string[] values)
+        public bool SetItems(UUID principalID, string[] names, string[] values)
         {
             return false;
         }
 
-        public bool RemoveItems(UUID userID, string[] names)
+        public bool RemoveItems(UUID principalID, string[] names)
         {
             return false;
         }
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 39368f1..ea08ea5 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -92,6 +92,10 @@ namespace OpenSim.Services.Interfaces
         public int AvatarType;
         public Dictionary<string,string> Data;
 
+        public AvatarData()
+        {
+        }
+
         public AvatarData(Dictionary<string, object> kvp)
         {
             Data = new Dictionary<string, string>();