Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 91e2976..4350749 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -287,6 +287,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
             account.UserFlags = response["UserFlags"].AsInteger();
             account.UserLevel = response["AccessLevel"].AsInteger();
             account.UserTitle = response["UserTitle"].AsString();
+            account.LocalToGrid = true;
+            if (response.ContainsKey("LocalToGrid"))
+                account.LocalToGrid = (response["LocalToGrid"].AsString() == "true" ? true : false);
+                
             GetFirstLastName(response["Name"].AsString(), out account.FirstName, out account.LastName);
 
             // Cache the user account info