aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorKitto Flora2010-02-12 14:08:32 -0500
committerKitto Flora2010-02-12 14:08:32 -0500
commit6a70349512a612948918db2f2f485e87b0bc87e6 (patch)
treebdbb11f3ec840c7a14402f0acdc302b04d5a0692 /OpenSim/Region/ClientStack/LindenUDP
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentResolve a merge issue (diff)
downloadopensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.zip
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.gz
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.bz2
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
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);