diff options
author | Justin Clarke Casey | 2009-02-13 20:12:11 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-13 20:12:11 +0000 |
commit | b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8 (patch) | |
tree | 897a3911b2ea50bc97f1bfa60d31c0608f976f35 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | * refactor: move alert commands from Scene to DialogModule (diff) | |
download | opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.zip opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.gz opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.bz2 opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.xz |
* Change static field "initialized" in RestInterregionComms to an instance field
* This was the cause of teleport tests interfering with each other
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 611b9db..c31e6f7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3750,7 +3750,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3750 | SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); | 3750 | SceneObjectPart jointProxyObject = GetSceneObjectPart(joint.ObjectNameInScene); |
3751 | if (jointProxyObject != null) | 3751 | if (jointProxyObject != null) |
3752 | { | 3752 | { |
3753 | SimChat(Utils.StringToBytes("[NINJA] " + message), | 3753 | SimChat(Utils.StringToBytes("[NINJA]: " + message), |
3754 | ChatTypeEnum.DebugChannel, | 3754 | ChatTypeEnum.DebugChannel, |
3755 | 2147483647, | 3755 | 2147483647, |
3756 | jointProxyObject.AbsolutePosition, | 3756 | jointProxyObject.AbsolutePosition, |
@@ -3762,7 +3762,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3762 | 3762 | ||
3763 | if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages) | 3763 | if (joint.ErrorMessageCount > PhysicsJoint.maxErrorMessages) |
3764 | { | 3764 | { |
3765 | SimChat(Utils.StringToBytes("[NINJA] Too many messages for this joint, suppressing further messages."), | 3765 | SimChat(Utils.StringToBytes("[NINJA]: Too many messages for this joint, suppressing further messages."), |
3766 | ChatTypeEnum.DebugChannel, | 3766 | ChatTypeEnum.DebugChannel, |
3767 | 2147483647, | 3767 | 2147483647, |
3768 | jointProxyObject.AbsolutePosition, | 3768 | jointProxyObject.AbsolutePosition, |