diff options
author | Melanie | 2010-02-06 01:13:01 +0000 |
---|---|---|
committer | Melanie | 2010-02-06 01:13:01 +0000 |
commit | 4a092b5ab81c58853dbb03149e7bd924623044ee (patch) | |
tree | 38f2fb0fc5bbd81815ce83736f089fe9ae925274 /OpenSim/Region/ClientStack | |
parent | Fixing an incorrect logging message in insertUserRow (diff) | |
parent | Revert "Old OpenSim installations may have no AssetCaching setting in config-... (diff) | |
download | opensim-SC-4a092b5ab81c58853dbb03149e7bd924623044ee.zip opensim-SC-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.gz opensim-SC-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.bz2 opensim-SC-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
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 1d364d4..6dc6f01 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -5190,6 +5190,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5190 | { | 5190 | { |
5191 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; | 5191 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; |
5192 | 5192 | ||
5193 | //m_log.DebugFormat("[CLIENT]: Received ScriptDialogReply from {0}", rdialog.Data.ObjectID); | ||
5194 | |||
5193 | #region Packet Session and User Check | 5195 | #region Packet Session and User Check |
5194 | if (m_checkPackets) | 5196 | if (m_checkPackets) |
5195 | { | 5197 | { |
@@ -5210,7 +5212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5210 | args.Type = ChatTypeEnum.Shout; | 5212 | args.Type = ChatTypeEnum.Shout; |
5211 | args.Position = new Vector3(); | 5213 | args.Position = new Vector3(); |
5212 | args.Scene = Scene; | 5214 | args.Scene = Scene; |
5213 | args.Sender = this; | 5215 | args.Sender = this; |
5214 | ChatMessage handlerChatFromClient2 = OnChatFromClient; | 5216 | ChatMessage handlerChatFromClient2 = OnChatFromClient; |
5215 | if (handlerChatFromClient2 != null) | 5217 | if (handlerChatFromClient2 != null) |
5216 | handlerChatFromClient2(this, args); | 5218 | handlerChatFromClient2(this, args); |