From 42f5394677a0a033e501f343cc3ccf02627e09d8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 29 Dec 2011 15:39:12 -0800
Subject: Added field LocalToGrid in UserAccount. Context: make HG work in
 Simian.

---
 OpenSim/Services/Interfaces/IUserAccountService.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'OpenSim/Services/Interfaces/IUserAccountService.cs')

diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 6cc8eb8..4f80549 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -37,11 +37,13 @@ namespace OpenSim.Services.Interfaces
     {
         public UserAccount()
         {
+            LocalToGrid = true;
         }
 
         public UserAccount(UUID principalID)
         {
             PrincipalID = principalID;
+            LocalToGrid = true;
         }
 
         /// <summary>
@@ -70,6 +72,7 @@ namespace OpenSim.Services.Interfaces
             Email = email;
             ServiceURLs = new Dictionary<string, object>();
             Created = Util.UnixTimeSinceEpoch();
+            LocalToGrid = true;
         }
 
         public UserAccount(UUID scopeID, UUID principalID, string firstName, string lastName, string email)
@@ -81,6 +84,7 @@ namespace OpenSim.Services.Interfaces
             Email = email;
             ServiceURLs = new Dictionary<string, object>();
             Created = Util.UnixTimeSinceEpoch();
+            LocalToGrid = true;
         }
 
         public string FirstName;
@@ -91,6 +95,7 @@ namespace OpenSim.Services.Interfaces
         public int UserLevel;
         public int UserFlags;
         public string UserTitle;
+        public Boolean LocalToGrid;
 
         public Dictionary<string, object> ServiceURLs;
 
@@ -119,6 +124,8 @@ namespace OpenSim.Services.Interfaces
                 UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString());
             if (kvp.ContainsKey("UserTitle"))
                 UserTitle = kvp["UserTitle"].ToString();
+            if (kvp.ContainsKey("LocalToGrid"))
+                Boolean.TryParse(kvp["LocalToGrid"].ToString(), out LocalToGrid);
 
             if (kvp.ContainsKey("Created"))
                 Created = Convert.ToInt32(kvp["Created"].ToString());
@@ -152,6 +159,7 @@ namespace OpenSim.Services.Interfaces
             result["UserLevel"] = UserLevel.ToString();
             result["UserFlags"] = UserFlags.ToString();
             result["UserTitle"] = UserTitle;
+            result["LocalToGrid"] = LocalToGrid.ToString();
 
             string str = string.Empty;
             foreach (KeyValuePair<string, object> kvp in ServiceURLs)
-- 
cgit v1.1


From 5aad1f7afed9770b94b4cabdd2f681781a16d662 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 30 Dec 2011 10:40:57 -0800
Subject: Default LocalToGrid to true. Fixes minor bug introduced yesterday
 where old robust UserAccount service would result is LocalToGrid at the sim
 being false.

---
 OpenSim/Services/Interfaces/IUserAccountService.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenSim/Services/Interfaces/IUserAccountService.cs')

diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 4f80549..1b85980 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -37,13 +37,11 @@ namespace OpenSim.Services.Interfaces
     {
         public UserAccount()
         {
-            LocalToGrid = true;
         }
 
         public UserAccount(UUID principalID)
         {
             PrincipalID = principalID;
-            LocalToGrid = true;
         }
 
         /// <summary>
@@ -72,7 +70,6 @@ namespace OpenSim.Services.Interfaces
             Email = email;
             ServiceURLs = new Dictionary<string, object>();
             Created = Util.UnixTimeSinceEpoch();
-            LocalToGrid = true;
         }
 
         public UserAccount(UUID scopeID, UUID principalID, string firstName, string lastName, string email)
@@ -84,7 +81,6 @@ namespace OpenSim.Services.Interfaces
             Email = email;
             ServiceURLs = new Dictionary<string, object>();
             Created = Util.UnixTimeSinceEpoch();
-            LocalToGrid = true;
         }
 
         public string FirstName;
@@ -95,7 +91,7 @@ namespace OpenSim.Services.Interfaces
         public int UserLevel;
         public int UserFlags;
         public string UserTitle;
-        public Boolean LocalToGrid;
+        public Boolean LocalToGrid = true;
 
         public Dictionary<string, object> ServiceURLs;
 
-- 
cgit v1.1