diff options
| author | Justin Clark-Casey (justincc) | 2011-10-28 23:16:46 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-28 23:16:46 +0100 |
| commit | 0fe756e42c23dabf3b754f3675597aaf6fb627c4 (patch) | |
| tree | aa9ebe244f7efe03b8e8cbf80a70b6fb34a6dade /OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |
| parent | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fet... (diff) | |
| parent | Removed use of 'is' operator and casting to find the root ScenePresence in Me... (diff) | |
| download | opensim-SC_OLD-0fe756e42c23dabf3b754f3675597aaf6fb627c4.zip opensim-SC_OLD-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.gz opensim-SC_OLD-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.bz2 opensim-SC_OLD-0fe756e42c23dabf3b754f3675597aaf6fb627c4.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 4359c01..2cd71c4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
| @@ -279,12 +279,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
| 279 | 279 | ||
| 280 | HashSet<UUID> receiverIDs = new HashSet<UUID>(); | 280 | HashSet<UUID> receiverIDs = new HashSet<UUID>(); |
| 281 | 281 | ||
| 282 | ((Scene)c.Scene).ForEachScenePresence( | 282 | ((Scene)c.Scene).ForEachRootScenePresence( |
| 283 | delegate(ScenePresence presence) | 283 | delegate(ScenePresence presence) |
| 284 | { | 284 | { |
| 285 | // ignore chat from child agents | ||
| 286 | if (presence.IsChildAgent) return; | ||
| 287 | |||
| 288 | IClientAPI client = presence.ControllingClient; | 285 | IClientAPI client = presence.ControllingClient; |
| 289 | 286 | ||
| 290 | // don't forward SayOwner chat from objects to | 287 | // don't forward SayOwner chat from objects to |