aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Scripting/WorldComm
diff options
context:
space:
mode:
authorDahlia Trimble2008-10-11 02:56:03 +0000
committerDahlia Trimble2008-10-11 02:56:03 +0000
commit37d42890e78a43c2e79c7cfb2a2c9c690f56613c (patch)
tree6c6354f09a4e1bfcfedeee1fa7e5bc6e12294f1d /OpenSim/Region/Environment/Modules/Scripting/WorldComm
parentRemove a UUID fudge that broke "Abandon Land" (diff)
downloadopensim-SC_OLD-37d42890e78a43c2e79c7cfb2a2c9c690f56613c.zip
opensim-SC_OLD-37d42890e78a43c2e79c7cfb2a2c9c690f56613c.tar.gz
opensim-SC_OLD-37d42890e78a43c2e79c7cfb2a2c9c690f56613c.tar.bz2
opensim-SC_OLD-37d42890e78a43c2e79c7cfb2a2c9c690f56613c.tar.xz
Thanks cmickyb for a patch that enhances the IRC module.
See mantis #2379 for some useful scripts that work with this. Note that I added another configuration parameter in addition to the patch to allow for legacy behavior in the absence of new configuration settings.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Scripting/WorldComm')
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs19
1 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
index f5ec389..f8e933d 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
@@ -222,10 +222,25 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
222 else { 222 else {
223 avatar = m_scene.GetScenePresence(id); 223 avatar = m_scene.GetScenePresence(id);
224 if (avatar != null) 224 if (avatar != null)
225 {
225 position = avatar.AbsolutePosition; 226 position = avatar.AbsolutePosition;
227 }
226 else 228 else
227 // bail out early, given source could not be found 229 {
228 return; 230 // This is potentially problematic, though I don't
231 // see how to take advantage of it, basically a request
232 // to send a message to the region does not have to come
233 // from something in the region (eg a plugin can send it)
234 if (type == ChatTypeEnum.Region)
235 {
236 position = new Vector3(128, 128, 20);
237 }
238 else
239 {
240 // bail out early, given source could not be found
241 return;
242 }
243 }
229 } 244 }
230 245
231 // Determine which listen event filters match the given set of arguments, this results 246 // Determine which listen event filters match the given set of arguments, this results