diff options
author | UbitUmarov | 2017-05-14 05:49:01 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-14 05:49:01 +0100 |
commit | 92df6095d5aed4f008dfdad7a597e72fdc70217d (patch) | |
tree | 04452a0b93e84bf0fe1e4cccb33fb9f1b21601f2 | |
parent | don't do dwell if there is no module active (diff) | |
download | opensim-SC-92df6095d5aed4f008dfdad7a597e72fdc70217d.zip opensim-SC-92df6095d5aed4f008dfdad7a597e72fdc70217d.tar.gz opensim-SC-92df6095d5aed4f008dfdad7a597e72fdc70217d.tar.bz2 opensim-SC-92df6095d5aed4f008dfdad7a597e72fdc70217d.tar.xz |
don't round to nearest int
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/DwellModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs index 55a341e..22480e6 100644 --- a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs | |||
@@ -130,14 +130,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
130 | { | 130 | { |
131 | ILandObject parcel = m_scene.LandChannel.GetLandObject(parcelID); | 131 | ILandObject parcel = m_scene.LandChannel.GetLandObject(parcelID); |
132 | if (parcel != null && parcel.LandData != null) | 132 | if (parcel != null && parcel.LandData != null) |
133 | return (int)(parcel.LandData.Dwell + 0.5f); | 133 | return (int)(parcel.LandData.Dwell); |
134 | return 0; | 134 | return 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | public int GetDwell(LandData land) | 137 | public int GetDwell(LandData land) |
138 | { | 138 | { |
139 | if (land != null) | 139 | if (land != null) |
140 | return (int)(land.Dwell + 0.5f); | 140 | return (int)(land.Dwell); |
141 | return 0; | 141 | return 0; |
142 | } | 142 | } |
143 | 143 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 9affe7d..ccb85f6 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -1849,7 +1849,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1849 | float newdwell = (float)(cur * 1.666666666667e-5); | 1849 | float newdwell = (float)(cur * 1.666666666667e-5); |
1850 | LandData.Dwell = newdwell; | 1850 | LandData.Dwell = newdwell; |
1851 | 1851 | ||
1852 | if(Math.Abs(newdwell - dwell) > 1.0) | 1852 | if(Math.Abs(newdwell - dwell) >= 0.9) |
1853 | m_scene.EventManager.TriggerLandObjectAdded(this); | 1853 | m_scene.EventManager.TriggerLandObjectAdded(this); |
1854 | } | 1854 | } |
1855 | } | 1855 | } |