From 6485c576a177d521ec26df7c0a5e374e22682396 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Apr 2010 12:03:34 -0700
Subject: * Made UserAccountService handle UserLevel, UserFlags and UserTitle
 appropriately. * Removed Store service from the UserAccount handler.

---
 OpenSim/Services/UserAccountService/UserAccountService.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Services/UserAccountService')

diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 38caf74..ff1b0e0 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -134,6 +134,10 @@ namespace OpenSim.Services.UserAccountService
                 u.UserTitle = d.Data["UserTitle"].ToString();
             else
                 u.UserTitle = string.Empty;
+            if (d.Data.ContainsKey("UserLevel") && d.Data["UserLevel"] != null)
+                Int32.TryParse(d.Data["UserLevel"], out u.UserLevel);
+            if (d.Data.ContainsKey("UserFlags") && d.Data["UserFlags"] != null)
+                Int32.TryParse(d.Data["UserFlags"], out u.UserFlags);
 
             if (d.Data.ContainsKey("ServiceURLs") && d.Data["ServiceURLs"] != null)
             {
@@ -218,6 +222,9 @@ namespace OpenSim.Services.UserAccountService
             d.Data = new Dictionary<string, string>();
             d.Data["Email"] = data.Email;
             d.Data["Created"] = data.Created.ToString();
+            d.Data["UserLevel"] = data.UserLevel.ToString();
+            d.Data["UserFlags"] = data.UserFlags.ToString();
+            d.Data["UserTitle"] = data.UserTitle.ToString();
 
             List<string> parts = new List<string>();
 
-- 
cgit v1.1


From e6ed9b6747f20ed2db55fac65bfbdf87bbdfa1e2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Apr 2010 18:12:03 -0700
Subject: * Guard against null in last commit

---
 OpenSim/Services/UserAccountService/UserAccountService.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/UserAccountService')

diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index ff1b0e0..7b38aa6 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -224,7 +224,8 @@ namespace OpenSim.Services.UserAccountService
             d.Data["Created"] = data.Created.ToString();
             d.Data["UserLevel"] = data.UserLevel.ToString();
             d.Data["UserFlags"] = data.UserFlags.ToString();
-            d.Data["UserTitle"] = data.UserTitle.ToString();
+            if (data.UserTitle != null)
+                d.Data["UserTitle"] = data.UserTitle.ToString();
 
             List<string> parts = new List<string>();
 
-- 
cgit v1.1