diff options
| author | teravus | 2012-11-15 09:46:41 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 09:46:41 -0500 |
| commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
| tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Framework/Client/IClientChat.cs | |
| parent | * Fixes mesh loading issues in last commit. (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz | |
Merge master into teravuswork
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 |