ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-06-07 00:44:36 +01:00
parent fad5158ab4 d91bd7646d
commit 74d62901c8
9 changed files with 252 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
View File

@@ -206,9 +206,7 @@ namespace OpenSim.Services.Connectors
if ((replyData != null) && replyData.ContainsKey("result") && (replyData["result"] != null))
{
if (replyData["result"] is Dictionary<string, object>)
{
guinfo = new GridUserInfo((Dictionary<string, object>)replyData["result"]);
}
}
return guinfo;

2
OpenSim/Services/Interfaces/IGridUserService.cs
View File

@@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces
Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
if (kvp.ContainsKey("LastRegionID"))
UUID.TryParse(kvp["LastRegionID"].ToString(), out HomeRegionID);
UUID.TryParse(kvp["LastRegionID"].ToString(), out LastRegionID);
if (kvp.ContainsKey("LastPosition"))
Vector3.TryParse(kvp["LastPosition"].ToString(), out LastPosition);
if (kvp.ContainsKey("LastLookAt"))