diff options
author | Robert Adams | 2013-12-14 07:53:01 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-14 07:53:01 -0800 |
commit | 13a9a4b653c5470e6a450bfd9b2049273a4ef7b2 (patch) | |
tree | 1168d93ebfff04893ec05a32c6bad456e1d00d32 /OpenSim/Region/Application | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.zip opensim-SC-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.gz opensim-SC-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.bz2 opensim-SC-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.xz |
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 1d93e9b..c2d9942 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -825,8 +825,8 @@ namespace OpenSim | |||
825 | MainConsole.Instance.Output(String.Format( | 825 | MainConsole.Instance.Output(String.Format( |
826 | "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}", | 826 | "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}", |
827 | scene.RegionInfo.RegionName, | 827 | scene.RegionInfo.RegionName, |
828 | scene.RegionInfo.LegacyRegionLocX, | 828 | scene.RegionInfo.RegionLocX, |
829 | scene.RegionInfo.LegacyRegionLocY, | 829 | scene.RegionInfo.RegionLocY, |
830 | scene.RegionInfo.InternalEndPoint.Port, | 830 | scene.RegionInfo.InternalEndPoint.Port, |
831 | scene.RegionInfo.EstateSettings.EstateName)); | 831 | scene.RegionInfo.EstateSettings.EstateName)); |
832 | }); | 832 | }); |
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 7e7f42e..0dc9306 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -743,7 +743,7 @@ namespace OpenSim | |||
743 | { | 743 | { |
744 | m_log.InfoFormat( | 744 | m_log.InfoFormat( |
745 | "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", | 745 | "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", |
746 | whichRegion.RegionName, whichRegion.LegacyRegionLocX, whichRegion.LegacyRegionLocY); | 746 | whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY); |
747 | 747 | ||
748 | ShutdownClientServer(whichRegion); | 748 | ShutdownClientServer(whichRegion); |
749 | IScene scene; | 749 | IScene scene; |