OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added field LocalToGrid in UserAccount. Context: make HG work in Simian.

iar_mods
Diva Canto 2011-12-29 15:39:12 -08:00
parent 98ab3dffa3
commit 42f5394677
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Services/Interfaces/IUserAccountService.cs
View File

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