diff options
| author | Melanie | 2010-05-08 13:31:36 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-08 13:31:36 +0100 |
| commit | 14fcc2510ef9f1effc06d7e99b57f7f74de08eac (patch) | |
| tree | e52f145ef2aac9a9cc7fb32a6a40e62f67991743 /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | test commit for panda (diff) | |
| download | opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.zip opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.gz opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.bz2 opensim-SC_OLD-14fcc2510ef9f1effc06d7e99b57f7f74de08eac.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 9f6414b..6da5558 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1729,7 +1729,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1729 | GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID, | 1729 | GridRegion home = m_app.SceneManager.CurrentOrFirstScene.GridService.GetRegionByPosition(scopeID, |
| 1730 | (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize)); | 1730 | (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize)); |
| 1731 | if (home != null) | 1731 | if (home != null) |
| 1732 | m_app.SceneManager.CurrentOrFirstScene.PresenceService.SetHomeLocation(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0)); | 1732 | m_app.SceneManager.CurrentOrFirstScene.GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0)); |
| 1733 | } | 1733 | } |
| 1734 | else | 1734 | else |
| 1735 | { | 1735 | { |