diff options
| author | Melanie | 2012-10-26 21:13:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-26 21:13:01 +0100 |
| commit | 26cc57b6cafda5168baab49cabe34d96f01dbd6d (patch) | |
| tree | 94e078a75ab68825e64b15498f67d82988858dc9 /OpenSim/Framework/Client | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make the error thrown logged when a simulator in grid mode is trying t... (diff) | |
| download | opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.zip opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.gz opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.bz2 opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Client/IClientChat.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs index 078ea9b..86b1faa 100644 --- a/OpenSim/Framework/Client/IClientChat.cs +++ b/OpenSim/Framework/Client/IClientChat.cs | |||
| @@ -33,7 +33,8 @@ namespace OpenSim.Framework.Client | |||
| 33 | { | 33 | { |
| 34 | event ChatMessage OnChatFromClient; | 34 | event ChatMessage OnChatFromClient; |
| 35 | 35 | ||
| 36 | void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, | 36 | void SendChatMessage( |
| 37 | byte audible); | 37 | string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source, |
| 38 | byte audible); | ||
| 38 | } | 39 | } |
| 39 | } | 40 | } \ No newline at end of file |