Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-08 13:31:36 +01:00
52 changed files with 1760 additions and 730 deletions

View File

@@ -1729,7 +1729,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID,
(int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
if (home != null)
m_app.SceneManager.CurrentOrFirstScene.PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
m_app.SceneManager.CurrentOrFirstScene.GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
}
else
{