aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-25 03:26:12 +0100
committerJustin Clark-Casey (justincc)2012-10-25 03:26:12 +0100
commitc13a99dc5cc82efac5497dab27dcb6b0d9865cea (patch)
treed9384f7104a9b38b333b682cd782b095c1bf1df2 /OpenSim/Framework
parentGet osNpcCreate() and osNpcLoadAppearance() to generate a script error if app... (diff)
downloadopensim-SC_OLD-c13a99dc5cc82efac5497dab27dcb6b0d9865cea.zip
opensim-SC_OLD-c13a99dc5cc82efac5497dab27dcb6b0d9865cea.tar.gz
opensim-SC_OLD-c13a99dc5cc82efac5497dab27dcb6b0d9865cea.tar.bz2
opensim-SC_OLD-c13a99dc5cc82efac5497dab27dcb6b0d9865cea.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Client/IClientChat.cs7
-rw-r--r--OpenSim/Framework/IClientAPI.cs16
2 files changed, 18 insertions, 5 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
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 9856978..87433cc 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1099,8 +1099,20 @@ namespace OpenSim.Framework
1099 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); 1099 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
1100 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 1100 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
1101 1101
1102 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, 1102 /// <summary>
1103 byte audible); 1103 /// Send chat to the viewer.
1104 /// </summary>
1105 /// <param name='message'></param>
1106 /// <param name='type'></param>
1107 /// <param name='fromPos'></param>
1108 /// <param name='fromName'></param>
1109 /// <param name='fromAgentID'></param>
1110 /// <param name='ownerID'></param>
1111 /// <param name='source'></param>
1112 /// <param name='audible'></param>
1113 void SendChatMessage(
1114 string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source,
1115 byte audible);
1104 1116
1105 void SendInstantMessage(GridInstantMessage im); 1117 void SendInstantMessage(GridInstantMessage im);
1106 1118