From c13a99dc5cc82efac5497dab27dcb6b0d9865cea Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 25 Oct 2012 03:26:12 +0100
Subject: Fix script error messages not showing up in viewer 3 and associated
viewers.
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
---
.../Region/CoreModules/Avatar/Chat/ChatModule.cs | 39 +++++++++++++++-------
1 file changed, 27 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Avatar')
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index e4452fb..ddf92c3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -186,6 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{
string fromName = c.From;
UUID fromID = UUID.Zero;
+ UUID ownerID = UUID.Zero;
UUID targetID = c.TargetUUID;
string message = c.Message;
IScene scene = c.Scene;
@@ -208,12 +209,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
fromPos = avatar.AbsolutePosition;
fromName = avatar.Name;
fromID = c.Sender.AgentId;
+ ownerID = c.Sender.AgentId;
break;
case ChatSourceType.Object:
fromID = c.SenderUUID;
+ if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
+ ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
+
break;
}
@@ -236,7 +241,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
s.ForEachRootScenePresence(
delegate(ScenePresence presence)
{
- if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType, false))
+ if (TrySendChatMessage(
+ presence, fromPos, regionPos, fromID, ownerID, fromName, c.Type, message, sourceType, false))
receiverIDs.Add(presence.UUID);
}
);
@@ -248,8 +254,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
ScenePresence presence = s.GetScenePresence(targetID);
if (presence != null && !presence.IsChildAgent)
{
- if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, ChatTypeEnum.Say, message, sourceType, true))
- receiverIDs.Add(presence.UUID);
+ if (TrySendChatMessage(
+ presence, fromPos, regionPos, fromID, ownerID, fromName, ChatTypeEnum.Say, message, sourceType, true))
+ receiverIDs.Add(presence.UUID);
}
}
}
@@ -305,9 +312,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
(null != c.SenderObject) &&
(((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
return;
-
- client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID,
- (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+
+ client.SendChatMessage(
+ c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
+ (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+
receiverIDs.Add(client.AgentId);
});
@@ -322,15 +331,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
///
/// /param>
///
+ ///
+ /// Owner of the message. For at least some messages from objects, this has to be correctly filled with the owner's UUID.
+ /// This is the case for script error messages in viewer 3 since LLViewer change EXT-7762
+ ///
///
///
///
///
/// true if the message was sent to the receiver, false if it was not sent due to failing a
/// precondition
- protected virtual bool TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
- UUID fromAgentID, string fromName, ChatTypeEnum type,
- string message, ChatSourceType src, bool ignoreDistance)
+ protected virtual bool TrySendChatMessage(
+ ScenePresence presence, Vector3 fromPos, Vector3 regionPos,
+ UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type,
+ string message, ChatSourceType src, bool ignoreDistance)
{
// don't send stuff to child agents
if (presence.IsChildAgent) return false;
@@ -353,10 +367,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
}
// TODO: should change so the message is sent through the avatar rather than direct to the ClientView
- presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName,
- fromAgentID, (byte)src, (byte)ChatAudibleLevel.Fully);
+ presence.ControllingClient.SendChatMessage(
+ message, (byte) type, fromPos, fromName,
+ fromAgentID, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully);
return true;
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1