aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-25 02:52:20 +0100
committerJustin Clark-Casey (justincc)2012-10-25 02:52:20 +0100
commitd9aaf51561ea7bb2ee030c648611a5281f21ec49 (patch)
treef28a621e8fbfb2d2c7ffa321cef50228bc162a06 /OpenSim/Region/Framework
parentMake osNpcCreate() return UUID.Zero instead of throwing an exception if notec... (diff)
downloadopensim-SC_OLD-d9aaf51561ea7bb2ee030c648611a5281f21ec49.zip
opensim-SC_OLD-d9aaf51561ea7bb2ee030c648611a5281f21ec49.tar.gz
opensim-SC_OLD-d9aaf51561ea7bb2ee030c648611a5281f21ec49.tar.bz2
opensim-SC_OLD-d9aaf51561ea7bb2ee030c648611a5281f21ec49.tar.xz
When scripts generate expected exceptions (e.g. due to checked bad parameter) throw ScriptException instead of just a plain old exception.
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests. No functional changes.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 6e53951..99bf72a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -38,7 +38,6 @@ namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 public partial class Scene 39 public partial class Scene
40 { 40 {
41
42 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, 41 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
43 UUID fromID, UUID targetID, bool fromAgent, bool broadcast) 42 UUID fromID, UUID targetID, bool fromAgent, bool broadcast)
44 { 43 {
@@ -66,6 +65,10 @@ namespace OpenSim.Region.Framework.Scenes
66 args.From = fromName; 65 args.From = fromName;
67 args.TargetUUID = targetID; 66 args.TargetUUID = targetID;
68 67
68// m_log.DebugFormat(
69// "[SCENE]: Sending message {0} on channel {1}, type {2} from {3}, broadcast {4}",
70// args.Message.Replace("\n", "\\n"), args.Channel, args.Type, fromName, broadcast);
71
69 if (broadcast) 72 if (broadcast)
70 EventManager.TriggerOnChatBroadcast(this, args); 73 EventManager.TriggerOnChatBroadcast(this, args);
71 else 74 else