diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 4c3f1cc..174642d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
| @@ -256,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
| 256 | // If camera is moved into client, then camera position can be used | 256 | // If camera is moved into client, then camera position can be used |
| 257 | // MT: No, it can't, as chat is heard from the avatar position, not | 257 | // MT: No, it can't, as chat is heard from the avatar position, not |
| 258 | // the camera position. | 258 | // the camera position. |
| 259 | s.ForEachRootScenePresence( | 259 | s.ForEachScenePresence( |
| 260 | delegate(ScenePresence presence) | 260 | delegate(ScenePresence presence) |
| 261 | { | 261 | { |
| 262 | if (destination != UUID.Zero && presence.UUID != destination) | 262 | if (destination != UUID.Zero && presence.UUID != destination) |