diff options
| author | Robert Adams | 2013-09-19 12:14:21 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-09-28 07:33:52 -0700 |
| commit | 317c04fe1714631d851684e3bb294f02056bcd07 (patch) | |
| tree | a4e935d869c9cb2d79f545f9b6dd1f73b01a7053 /OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs | |
| parent | minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff) | |
| download | opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.zip opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.tar.gz opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.tar.bz2 opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.tar.xz | |
VarRegion: change RegionInfo storage of region coordinates from region
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs index 83732e2..7f616bb 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs | |||
| @@ -100,8 +100,8 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 100 | UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, | 100 | UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, |
| 101 | UUID fromtaskid) | 101 | UUID fromtaskid) |
| 102 | { | 102 | { |
| 103 | int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX; | 103 | int differenceX = (int)m_virtScene.RegionInfo.LegacyRegionLocX - (int)m_rootScene.RegionInfo.LegacyRegionLocX; |
| 104 | int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY; | 104 | int differenceY = (int)m_virtScene.RegionInfo.LegacyRegionLocY - (int)m_rootScene.RegionInfo.LegacyRegionLocY; |
| 105 | rayend.X += differenceX * (int)Constants.RegionSize; | 105 | rayend.X += differenceX * (int)Constants.RegionSize; |
| 106 | rayend.Y += differenceY * (int)Constants.RegionSize; | 106 | rayend.Y += differenceY * (int)Constants.RegionSize; |
| 107 | raystart.X += differenceX * (int)Constants.RegionSize; | 107 | raystart.X += differenceX * (int)Constants.RegionSize; |
| @@ -126,8 +126,8 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 126 | PrimitiveBaseShape shape, byte bypassraycast, Vector3 raystart, UUID raytargetid, | 126 | PrimitiveBaseShape shape, byte bypassraycast, Vector3 raystart, UUID raytargetid, |
| 127 | byte rayendisintersection) | 127 | byte rayendisintersection) |
| 128 | { | 128 | { |
| 129 | int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX; | 129 | int differenceX = (int)m_virtScene.RegionInfo.LegacyRegionLocX - (int)m_rootScene.RegionInfo.LegacyRegionLocX; |
| 130 | int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY; | 130 | int differenceY = (int)m_virtScene.RegionInfo.LegacyRegionLocY - (int)m_rootScene.RegionInfo.LegacyRegionLocY; |
| 131 | rayend.X += differenceX * (int)Constants.RegionSize; | 131 | rayend.X += differenceX * (int)Constants.RegionSize; |
| 132 | rayend.Y += differenceY * (int)Constants.RegionSize; | 132 | rayend.Y += differenceY * (int)Constants.RegionSize; |
| 133 | raystart.X += differenceX * (int)Constants.RegionSize; | 133 | raystart.X += differenceX * (int)Constants.RegionSize; |