diff options
author | Diva Canto | 2012-09-13 10:00:52 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-13 10:00:52 -0700 |
commit | dd0a89a0e64573fd947928050d03e8389d95c799 (patch) | |
tree | 7920b18d85f6e1e1a43525f548774bca1fa75aac | |
parent | Restarting to work on HGSuitcaseInventoryService: added the ability for the o... (diff) | |
parent | Documentation of parcel-related events (diff) | |
download | opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.zip opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.tar.gz opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.tar.bz2 opensim-SC_OLD-dd0a89a0e64573fd947928050d03e8389d95c799.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
4 files changed, 47 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index c81e283..43a19fa 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -687,7 +687,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
687 | const int sampleLength = 80; | 687 | const int sampleLength = 80; |
688 | char[] sampleChars = new char[sampleLength]; | 688 | char[] sampleChars = new char[sampleLength]; |
689 | reader.Read(sampleChars, 0, sampleLength); | 689 | reader.Read(sampleChars, 0, sampleLength); |
690 | output = string.Format("[BASE HTTP SERVER]: {0}...", sampleChars); | 690 | output = string.Format("[BASE HTTP SERVER]: {0}...", new string(sampleChars).Replace("\n", @"\n")); |
691 | } | 691 | } |
692 | else | 692 | else |
693 | { | 693 | { |
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs index b367b12..7402c73 100644 --- a/OpenSim/Framework/Servers/MainServer.cs +++ b/OpenSim/Framework/Servers/MainServer.cs | |||
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Servers | |||
144 | } | 144 | } |
145 | else | 145 | else |
146 | { | 146 | { |
147 | MainConsole.Instance.Output("Usage: debug http 0..3"); | 147 | MainConsole.Instance.Output("Usage: debug http 0..5"); |
148 | } | 148 | } |
149 | } | 149 | } |
150 | 150 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs index b2f71d1..665875f 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 | |||
69 | /// without recounting the whole sim. | 69 | /// without recounting the whole sim. |
70 | /// | 70 | /// |
71 | /// We start out tainted so that the first get call resets the various prim counts. | 71 | /// We start out tainted so that the first get call resets the various prim counts. |
72 | /// <value> | 72 | /// </value> |
73 | private bool m_Tainted = true; | 73 | private bool m_Tainted = true; |
74 | 74 | ||
75 | private Object m_TaintLock = new Object(); | 75 | private Object m_TaintLock = new Object(); |
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 02c032e..2f34785 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -154,10 +154,32 @@ namespace OpenSim.Region.Framework.Scenes | |||
154 | 154 | ||
155 | public delegate void OnParcelPrimCountUpdateDelegate(); | 155 | public delegate void OnParcelPrimCountUpdateDelegate(); |
156 | 156 | ||
157 | /// <summary> | ||
158 | /// Triggered whenever the prim count may have been altered, or prior | ||
159 | /// to an action that requires the current prim count to be accurate. | ||
160 | /// </summary> | ||
161 | /// <remarks> | ||
162 | /// Triggered by <see cref="TriggerParcelPrimCountUpdate"/> in | ||
163 | /// <see cref="OpenSim.OpenSimBase.CreateRegion"/>, | ||
164 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandManagementModule.EventManagerOnRequestParcelPrimCountUpdate"/>, | ||
165 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandManagementModule.ClientOnParcelObjectOwnerRequest"/>, | ||
166 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandObject.GetPrimsFree"/>, | ||
167 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandObject.UpdateLandSold"/>, | ||
168 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandObject.DeedToGroup"/>, | ||
169 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandObject.SendLandUpdateToClient"/> | ||
170 | /// </remarks> | ||
157 | public event OnParcelPrimCountUpdateDelegate OnParcelPrimCountUpdate; | 171 | public event OnParcelPrimCountUpdateDelegate OnParcelPrimCountUpdate; |
158 | 172 | ||
159 | public delegate void OnParcelPrimCountAddDelegate(SceneObjectGroup obj); | 173 | public delegate void OnParcelPrimCountAddDelegate(SceneObjectGroup obj); |
160 | 174 | ||
175 | /// <summary> | ||
176 | /// Triggered in response to <see cref="OnParcelPrimCountUpdate"/> for | ||
177 | /// objects that actually contribute to parcel prim count. | ||
178 | /// </summary> | ||
179 | /// <remarks> | ||
180 | /// Triggered by <see cref="TriggerParcelPrimCountAdd"/> in | ||
181 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandManagementModule.EventManagerOnParcelPrimCountUpdate"/> | ||
182 | /// </remarks> | ||
161 | public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd; | 183 | public event OnParcelPrimCountAddDelegate OnParcelPrimCountAdd; |
162 | 184 | ||
163 | public delegate void OnPluginConsoleDelegate(string[] args); | 185 | public delegate void OnPluginConsoleDelegate(string[] args); |
@@ -178,6 +200,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
178 | 200 | ||
179 | public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; | 201 | public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; |
180 | 202 | ||
203 | /// <summary> | ||
204 | /// Triggered after parcel properties have been updated. | ||
205 | /// </summary> | ||
206 | /// <remarks> | ||
207 | /// Triggered by <see cref="TriggerOnParcelPropertiesUpdateRequest"/> in | ||
208 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandManagementModule.ClientOnParcelPropertiesUpdateRequest"/>, | ||
209 | /// <see cref="OpenSim.Region.CoreModules.World.Land.LandManagementModule.ProcessPropertiesUpdate"/> | ||
210 | /// </remarks> | ||
181 | public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; | 211 | public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; |
182 | 212 | ||
183 | /// <summary> | 213 | /// <summary> |
@@ -428,6 +458,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
428 | public event RequestParcelPrimCountUpdate OnRequestParcelPrimCountUpdate; | 458 | public event RequestParcelPrimCountUpdate OnRequestParcelPrimCountUpdate; |
429 | 459 | ||
430 | public delegate void ParcelPrimCountTainted(); | 460 | public delegate void ParcelPrimCountTainted(); |
461 | |||
462 | /// <summary> | ||
463 | /// Triggered when the parcel prim count has been altered. | ||
464 | /// </summary> | ||
465 | /// <remarks> | ||
466 | /// Triggered by <see cref="TriggerParcelPrimCountTainted"/> in | ||
467 | /// <see cref="OpenSim.Region.CoreModules.Avatar.Attachments.AttachmentsModule.DetachSingleAttachmentToGround"/>, | ||
468 | /// <see cref="OpenSim.Region.CoreModules.Avatar.Attachments.AttachmentsModule.AttachToAgent"/>, | ||
469 | /// <see cref="Scene.DeleteSceneObject"/>, | ||
470 | /// <see cref="Scene.SelectPrim"/>, | ||
471 | /// <see cref="Scene.DeselectPrim"/>, | ||
472 | /// <see cref="SceneObjectGroup.UpdatePrimFlags"/>, | ||
473 | /// <see cref="SceneObjectGroup.AbsolutePosition"/> | ||
474 | /// </remarks> | ||
431 | public event ParcelPrimCountTainted OnParcelPrimCountTainted; | 475 | public event ParcelPrimCountTainted OnParcelPrimCountTainted; |
432 | public event GetScriptRunning OnGetScriptRunning; | 476 | public event GetScriptRunning OnGetScriptRunning; |
433 | 477 | ||