diff options
author | Adam Johnson | 2007-12-07 08:54:31 +0000 |
---|---|---|
committer | Adam Johnson | 2007-12-07 08:54:31 +0000 |
commit | 3d938f76b7c2f8ede862f9979383d79dfb21372c (patch) | |
tree | 0c99beb3affa959f596e079f20ed806364e3d3dc /OpenSim/Region/Environment/Modules | |
parent | * Added hacked support for 'anyone can move' and 'anyone can copy'. (diff) | |
download | opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.zip opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.gz opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.bz2 opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.xz |
Updates to LibSL revision 1498. Thanks Johan!
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ChatModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/WorldCommModule.cs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index c93804f..8af7b49 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs | |||
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules | |||
192 | scene.RegionInfo.RegionLocY * 256, | 192 | scene.RegionInfo.RegionLocY * 256, |
193 | 0); | 193 | 0); |
194 | dis = | 194 | dis = |
195 | Math.Abs((int)avatarRegionPos.GetDistanceTo(fromRegionPos)); | 195 | Math.Abs((int) Util.GetDistanceTo(avatarRegionPos, fromRegionPos)); |
196 | 196 | ||
197 | switch (e.Type) | 197 | switch (e.Type) |
198 | { | 198 | { |
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs index a31b484..0dad998 100644 --- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.Modules | |||
135 | { | 135 | { |
136 | m_listenerManager.Remove(handle); | 136 | m_listenerManager.Remove(handle); |
137 | } | 137 | } |
138 | 138 | ||
139 | // This method scans nearby objects and determines if they are listeners, | 139 | // This method scans nearby objects and determines if they are listeners, |
140 | // and if so if this message fits the filter. If it does, then | 140 | // and if so if this message fits the filter. If it does, then |
141 | // enqueue the message for delivery to the objects listen event handler. | 141 | // enqueue the message for delivery to the objects listen event handler. |
@@ -171,9 +171,9 @@ namespace OpenSim.Region.Environment.Modules | |||
171 | double dis = 0; | 171 | double dis = 0; |
172 | 172 | ||
173 | if (source != null) | 173 | if (source != null) |
174 | dis = sPart.AbsolutePosition.GetDistanceTo(source.AbsolutePosition); | 174 | dis = Util.GetDistanceTo(sPart.AbsolutePosition, source.AbsolutePosition); |
175 | else | 175 | else |
176 | dis = sPart.AbsolutePosition.GetDistanceTo(avatar.AbsolutePosition); | 176 | dis = Util.GetDistanceTo(sPart.AbsolutePosition, avatar.AbsolutePosition); |
177 | 177 | ||
178 | switch (type) | 178 | switch (type) |
179 | { | 179 | { |
@@ -490,4 +490,4 @@ namespace OpenSim.Region.Environment.Modules | |||
490 | return m_id; | 490 | return m_id; |
491 | } | 491 | } |
492 | } | 492 | } |
493 | } \ No newline at end of file | 493 | } |