aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorAdam Frisby2008-04-26 12:40:14 +0000
committerAdam Frisby2008-04-26 12:40:14 +0000
commit3dc60c14332de6edb8d36c34b9f0e4566587fa00 (patch)
tree07dac9e1cf96f55f65a7cf4d196bfbed2dd2928a /OpenSim/Region/Environment
parent* For info about this commit, see last commit. (diff)
downloadopensim-SC_OLD-3dc60c14332de6edb8d36c34b9f0e4566587fa00.zip
opensim-SC_OLD-3dc60c14332de6edb8d36c34b9f0e4566587fa00.tar.gz
opensim-SC_OLD-3dc60c14332de6edb8d36c34b9f0e4566587fa00.tar.bz2
opensim-SC_OLD-3dc60c14332de6edb8d36c34b9f0e4566587fa00.tar.xz
* Committing Mantis #1061 - llRegionSay and llSetPrimitiveParams implementations. Thanks Melanie!
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/WorldCommModule.cs39
1 files changed, 19 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 5b18757..638deed 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -186,11 +186,6 @@ namespace OpenSim.Region.Environment.Modules
186 186
187 if (sPart != null) 187 if (sPart != null)
188 { 188 {
189 // Dont process if this message is from itself!
190 if (li.GetHostID().ToString().Equals(sourceItemID) ||
191 sPart.UUID.ToString().Equals(sourceItemID))
192 continue;
193
194 double dis = 0; 189 double dis = 0;
195 190
196 if (source != null) 191 if (source != null)
@@ -260,21 +255,25 @@ namespace OpenSim.Region.Environment.Modules
260 break; 255 break;
261 256
262 case ChatTypeEnum.Broadcast: 257 case ChatTypeEnum.Broadcast:
263 ListenerInfo isListen = 258 // Dont process if this message is from itself!
264 m_listenerManager.IsListenerMatch(sourceItemID, li.GetItemID(), channel, name, msg); 259 if (li.GetHostID().ToString().Equals(sourceItemID) ||
265 if (isListen != null) 260 sPart.UUID.ToString().Equals(sourceItemID))
266 { 261 continue;
267 ListenerInfo isListener = m_listenerManager.IsListenerMatch( 262
268 sourceItemID, sPart.UUID, channel, name, msg 263 if (li.GetChannel() == channel)
269 ); 264 {
270 if (isListener != null) 265 ListenerInfo isListener = m_listenerManager.IsListenerMatch(
271 { 266 sourceItemID, sPart.UUID, channel, name, msg
272 lock (m_pending.SyncRoot) 267 );
273 { 268 if (isListener != null)
274 m_pending.Enqueue(isListener); 269 {
275 } 270 lock (m_pending.SyncRoot)
276 } 271 {
277 } 272 m_pending.Enqueue(isListener);
273 }
274 }
275 }
276
278 break; 277 break;
279 } 278 }
280 } 279 }