diff options
| author | Melanie | 2012-03-31 02:18:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-31 02:18:02 +0100 |
| commit | f3132c45d98af7bb38251ad95013c433b5eda9e5 (patch) | |
| tree | efc3d6c0529678c0a56f5a505a52944012ea607a /OpenSim/Region/CoreModules/Scripting | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... (diff) | |
| download | opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.zip opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.gz opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.bz2 opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index ef9b4e0..176c86d 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | |||
| @@ -319,7 +319,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
| 319 | // Send message to avatar | 319 | // Send message to avatar |
| 320 | if (channel == 0) | 320 | if (channel == 0) |
| 321 | { | 321 | { |
| 322 | m_scene.SimChatBroadcast(Utils.StringToBytes(msg), ChatTypeEnum.Owner, 0, pos, name, id, false); | 322 | m_scene.SimChatBroadcast(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, false); |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | List<SceneObjectGroup> attachments = sp.GetAttachments(); | 325 | List<SceneObjectGroup> attachments = sp.GetAttachments(); |