diff options
author | Melanie | 2010-02-08 22:11:38 +0000 |
---|---|---|
committer | Melanie | 2010-02-08 22:11:38 +0000 |
commit | c8f3bb56ff20493b9f51a123a1d89e876e0cab75 (patch) | |
tree | 0f878d1eb21f821f517ebe8170776023952e6e2c /OpenSim/Region/ClientStack | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.zip opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.tar.gz opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.tar.bz2 opensim-SC-c8f3bb56ff20493b9f51a123a1d89e876e0cab75.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 1496f5c..3d9eaa1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -5177,6 +5177,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5177 | { | 5177 | { |
5178 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; | 5178 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; |
5179 | 5179 | ||
5180 | //m_log.DebugFormat("[CLIENT]: Received ScriptDialogReply from {0}", rdialog.Data.ObjectID); | ||
5181 | |||
5180 | #region Packet Session and User Check | 5182 | #region Packet Session and User Check |
5181 | if (m_checkPackets) | 5183 | if (m_checkPackets) |
5182 | { | 5184 | { |
@@ -5197,7 +5199,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5197 | args.Type = ChatTypeEnum.Shout; | 5199 | args.Type = ChatTypeEnum.Shout; |
5198 | args.Position = new Vector3(); | 5200 | args.Position = new Vector3(); |
5199 | args.Scene = Scene; | 5201 | args.Scene = Scene; |
5200 | args.Sender = this; | 5202 | args.Sender = this; |
5201 | ChatMessage handlerChatFromClient2 = OnChatFromClient; | 5203 | ChatMessage handlerChatFromClient2 = OnChatFromClient; |
5202 | if (handlerChatFromClient2 != null) | 5204 | if (handlerChatFromClient2 != null) |
5203 | handlerChatFromClient2(this, args); | 5205 | handlerChatFromClient2(this, args); |