Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs

1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index d0fddee..6d5d2a0 100644
--- a/OpenSim/Services/Interfaces/IUserAccountService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -92,6 +92,7 @@ namespace OpenSim.Services.Interfaces
         public int UserFlags;
         public string UserTitle;
         public string UserCountry;
+        public Boolean LocalToGrid = true;
 
         public Dictionary<string, object> ServiceURLs;
 
@@ -122,6 +123,8 @@ namespace OpenSim.Services.Interfaces
                 UserTitle = kvp["UserTitle"].ToString();
             if (kvp.ContainsKey("UserCountry"))
                 UserCountry = kvp["UserCountry"].ToString();
+            if (kvp.ContainsKey("LocalToGrid"))
+                Boolean.TryParse(kvp["LocalToGrid"].ToString(), out LocalToGrid);
 
             if (kvp.ContainsKey("Created"))
                 Created = Convert.ToInt32(kvp["Created"].ToString());
@@ -156,6 +159,7 @@ namespace OpenSim.Services.Interfaces
             result["UserFlags"] = UserFlags.ToString();
             result["UserTitle"] = UserTitle;
             result["UserCountry"] = UserCountry;
+            result["LocalToGrid"] = LocalToGrid.ToString();
 
             string str = string.Empty;
             foreach (KeyValuePair<string, object> kvp in ServiceURLs)