ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
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
This commit is contained in:
Melanie
2012-01-02 21:41:36 +00:00
parent bde004c08e fac8c25851
commit a6e305063e
29 changed files with 268 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)