From 7df7b86ec5e6186fc86dd075792f56001cac66f2 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 12 Sep 2012 23:01:07 +0100 Subject: [PATCH 1/4] Fix bug in logging sample input at debug http level 4. Also converts newlines to "\n" text. --- OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index c81e2834c8..43a19fae63 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -687,7 +687,7 @@ namespace OpenSim.Framework.Servers.HttpServer const int sampleLength = 80; char[] sampleChars = new char[sampleLength]; reader.Read(sampleChars, 0, sampleLength); - output = string.Format("[BASE HTTP SERVER]: {0}...", sampleChars); + output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n")); } else { From cdc3781f42869586aa4bba482359f8cda21cb912 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 12 Sep 2012 23:02:25 +0100 Subject: [PATCH 2/4] Fix usage statement on "debug http" console command since max level is now 5 rather than 3 --- OpenSim/Framework/Servers/MainServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index b367b12512..7402c735c1 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs @@ -144,7 +144,7 @@ namespace OpenSim.Framework.Servers } else { - MainConsole.Instance.Output("Usage: debug http 0..3"); + MainConsole.Instance.Output("Usage: debug http 0..5"); } } From 9598c1af9e365cc212de42057c963fef5f3ad190 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 13 Sep 2012 13:10:59 +0100 Subject: [PATCH 3/4] correcting a typo that causes c# express to complain about xml comment containing invalid xml Signed-off-by: BlueWall --- OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs index b2f71d1250..665875fc49 100644 --- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs @@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Land /// without recounting the whole sim. /// /// We start out tainted so that the first get call resets the various prim counts. - /// + /// private bool m_Tainted = true; private Object m_TaintLock = new Object(); From 46d8405229becbad5025278226e416c37160dd96 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Thu, 13 Sep 2012 13:36:10 +0100 Subject: [PATCH 4/4] Documentation of parcel-related events Signed-off-by: BlueWall --- .../Region/Framework/Scenes/EventManager.cs | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 02c032e452..2f347859a3 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs @@ -154,10 +154,32 @@ namespace OpenSim.Region.Framework.Scenes public delegate void OnParcelPrimCountUpdateDelegate(); + /// + /// Triggered whenever the prim count may have been altered, or prior + /// to an action that requires the current prim count to be accurate. + /// + /// + /// Triggered by in + /// , + /// , + /// , + /// , + /// , + /// , + /// + /// public event OnParcelPrimCountUpdateDelegate OnParcelPrimCountUpdate; public delegate void OnParcelPrimCountAddDelegate(SceneObjectGroup obj); + /// + /// Triggered in response to for + /// objects that actually contribute to parcel prim count. + /// + /// + /// Triggered by in + /// + /// public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd; public delegate void OnPluginConsoleDelegate(string[] args); @@ -178,6 +200,14 @@ namespace OpenSim.Region.Framework.Scenes public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; + /// + /// Triggered after parcel properties have been updated. + /// + /// + /// Triggered by in + /// , + /// + /// public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; /// @@ -428,6 +458,20 @@ namespace OpenSim.Region.Framework.Scenes public event RequestParcelPrimCountUpdate OnRequestParcelPrimCountUpdate; public delegate void ParcelPrimCountTainted(); + + /// + /// Triggered when the parcel prim count has been altered. + /// + /// + /// Triggered by in + /// , + /// , + /// , + /// , + /// , + /// , + /// + /// public event ParcelPrimCountTainted OnParcelPrimCountTainted; public event GetScriptRunning OnGetScriptRunning;