aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs120
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs6
3 files changed, 119 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index e1c9c8e..f079e00 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -184,6 +184,22 @@ namespace OpenSim.Region.Framework.Scenes
184 184
185 public delegate void OnPluginConsoleDelegate(string[] args); 185 public delegate void OnPluginConsoleDelegate(string[] args);
186 186
187 /// <summary>
188 /// Triggered after <see cref="OpenSim.IApplicationPlugin.PostInitialise"/>
189 /// has been called for all <see cref="OpenSim.IApplicationPlugin"/>
190 /// loaded via <see cref="OpenSim.OpenSimBase.LoadPlugins"/>.
191 /// Handlers for this event are typically used to parse the arguments
192 /// from <see cref="OnPluginConsoleDelegate"/> in order to process or
193 /// filter the arguments and pass them onto <see cref="OpenSim.Region.CoreModules.Framework.InterfaceCommander.Commander.ProcessConsoleCommand"/>
194 /// </summary>
195 /// <remarks>
196 /// Triggered by <see cref="TriggerOnPluginConsole"/> in
197 /// <see cref="Scene.SendCommandToPlugins"/> via
198 /// <see cref="SceneManager.SendCommandToPluginModules"/> via
199 /// <see cref="OpenSim.OpenSimBase.HandleCommanderCommand"/> via
200 /// <see cref="OpenSim.OpenSimBase.AddPluginCommands"/> via
201 /// <see cref="OpenSim.OpenSimBase.StartupSpecific"/>
202 /// </remarks>
187 public event OnPluginConsoleDelegate OnPluginConsole; 203 public event OnPluginConsoleDelegate OnPluginConsole;
188 204
189 /// <summary> 205 /// <summary>
@@ -198,6 +214,18 @@ namespace OpenSim.Region.Framework.Scenes
198 214
199 public delegate void OnSetRootAgentSceneDelegate(UUID agentID, Scene scene); 215 public delegate void OnSetRootAgentSceneDelegate(UUID agentID, Scene scene);
200 216
217 /// <summary>
218 /// Triggered before the grunt work for adding a root agent to a
219 /// scene has been performed (resuming attachment scripts, physics,
220 /// animations etc.)
221 /// </summary>
222 /// <remarks>
223 /// Triggered before <see cref="OnMakeRootAgent"/>
224 /// by <see cref="TriggerSetRootAgentScene"/>
225 /// in <see cref="ScenePresence.MakeRootAgent"/>
226 /// via <see cref="Scene.AgentCrossing"/>
227 /// and <see cref="ScenePresence.CompleteMovement"/>
228 /// </remarks>
201 public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; 229 public event OnSetRootAgentSceneDelegate OnSetRootAgentScene;
202 230
203 /// <summary> 231 /// <summary>
@@ -222,12 +250,34 @@ namespace OpenSim.Region.Framework.Scenes
222 /// <summary> 250 /// <summary>
223 /// Fired when an object is touched/grabbed. 251 /// Fired when an object is touched/grabbed.
224 /// </summary> 252 /// </summary>
253 /// <remarks>
225 /// The originalID is the local ID of the part that was actually touched. The localID itself is always that of 254 /// The originalID is the local ID of the part that was actually touched. The localID itself is always that of
226 /// the root part. 255 /// the root part.
256 /// Triggerd in response to <see cref="OpenSim.Framework.IClientAPI.OnGrabObject"/>
257 /// via <see cref="TriggerObjectGrab"/>
258 /// in <see cref="Scene.ProcessObjectGrab"/>
259 /// </remarks>
227 public event ObjectGrabDelegate OnObjectGrab; 260 public event ObjectGrabDelegate OnObjectGrab;
228 public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs); 261 public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);
229 262
263 /// <summary>
264 /// Triggered when an object is being touched/grabbed continuously.
265 /// </summary>
266 /// <remarks>
267 /// Triggered in response to <see cref="OpenSim.Framework.IClientAPI.OnGrabUpdate"/>
268 /// via <see cref="TriggerObjectGrabbing"/>
269 /// in <see cref="Scene.ProcessObjectGrabUpdate"/>
270 /// </remarks>
230 public event ObjectGrabDelegate OnObjectGrabbing; 271 public event ObjectGrabDelegate OnObjectGrabbing;
272
273 /// <summary>
274 /// Triggered when an object stops being touched/grabbed.
275 /// </summary>
276 /// <remarks>
277 /// Triggered in response to <see cref="OpenSim.Framework.IClientAPI.OnDeGrabObject"/>
278 /// via <see cref="TriggerObjectDeGrab"/>
279 /// in <see cref="Scene.ProcessObjectDeGrab"/>
280 /// </remarks>
231 public event ObjectDeGrabDelegate OnObjectDeGrab; 281 public event ObjectDeGrabDelegate OnObjectDeGrab;
232 public event ScriptResetDelegate OnScriptReset; 282 public event ScriptResetDelegate OnScriptReset;
233 283
@@ -391,15 +441,36 @@ namespace OpenSim.Region.Framework.Scenes
391 public event ScriptColliding OnScriptLandColliderEnd; 441 public event ScriptColliding OnScriptLandColliderEnd;
392 442
393 public delegate void OnMakeChildAgentDelegate(ScenePresence presence); 443 public delegate void OnMakeChildAgentDelegate(ScenePresence presence);
444
445 /// <summary>
446 /// Triggered when an agent has been made a child agent of a scene.
447 /// </summary>
448 /// <remarks>
449 /// Triggered by <see cref="TriggerOnMakeChildAgent"/>
450 /// in <see cref="ScenePresence.MakeChildAgent"/>
451 /// via <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.CrossAgentToNewRegionAsync"/>,
452 /// <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.DoTeleport"/>,
453 /// <see cref="OpenSim.Region.CoreModules.InterGrid.KillAUser.ShutdownNoLogout"/>
454 /// </remarks>
394 public event OnMakeChildAgentDelegate OnMakeChildAgent; 455 public event OnMakeChildAgentDelegate OnMakeChildAgent;
395 456
396 public delegate void OnSaveNewWindlightProfileDelegate(); 457 public delegate void OnSaveNewWindlightProfileDelegate();
397 public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionLightShareData wl, UUID user); 458 public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionLightShareData wl, UUID user);
398 459
399 /// <summary> 460 /// <summary>
461 /// Triggered after the grunt work for adding a root agent to a
462 /// scene has been performed (resuming attachment scripts, physics,
463 /// animations etc.)
464 /// </summary>
465 /// <remarks>
400 /// This event is on the critical path for transferring an avatar from one region to another. Try and do 466 /// This event is on the critical path for transferring an avatar from one region to another. Try and do
401 /// as little work on this event as possible, or do work asynchronously. 467 /// as little work on this event as possible, or do work asynchronously.
402 /// </summary> 468 /// Triggered after <see cref="OnSetRootAgentScene"/>
469 /// by <see cref="TriggerOnMakeRootAgent"/>
470 /// in <see cref="ScenePresence.MakeRootAgent"/>
471 /// via <see cref="Scene.AgentCrossing"/>
472 /// and <see cref="ScenePresence.CompleteMovement"/>
473 /// </remarks>
403 public event Action<ScenePresence> OnMakeRootAgent; 474 public event Action<ScenePresence> OnMakeRootAgent;
404 475
405 public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted; 476 public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted;
@@ -425,9 +496,10 @@ namespace OpenSim.Region.Framework.Scenes
425 public event AvatarKillData OnAvatarKilled; 496 public event AvatarKillData OnAvatarKilled;
426 public delegate void AvatarKillData(uint KillerLocalID, ScenePresence avatar); 497 public delegate void AvatarKillData(uint KillerLocalID, ScenePresence avatar);
427 498
428// public delegate void ScriptTimerEvent(uint localID, double timerinterval); 499 /*
429 500 public delegate void ScriptTimerEvent(uint localID, double timerinterval);
430// public event ScriptTimerEvent OnScriptTimerEvent; 501 public event ScriptTimerEvent OnScriptTimerEvent;
502 */
431 503
432 public delegate void EstateToolsSunUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour); 504 public delegate void EstateToolsSunUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour);
433 public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID); 505 public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID);
@@ -437,12 +509,27 @@ namespace OpenSim.Region.Framework.Scenes
437 /// <summary> 509 /// <summary>
438 /// Triggered when an object is added to the scene. 510 /// Triggered when an object is added to the scene.
439 /// </summary> 511 /// </summary>
512 /// <remarks>
513 /// Triggered by <see cref="TriggerObjectAddedToScene"/>
514 /// in <see cref="Scene.AddNewSceneObject"/>,
515 /// <see cref="Scene.DuplicateObject"/>,
516 /// <see cref="Scene.doObjectDuplicateOnRay"/>
517 /// </remarks>
440 public event Action<SceneObjectGroup> OnObjectAddedToScene; 518 public event Action<SceneObjectGroup> OnObjectAddedToScene;
441 519
442 /// <summary> 520 /// <summary>
443 /// Triggered when an object is removed from the scene. 521 /// Delegate for <see cref="OnObjectBeingRemovedFromScene"/>
444 /// </summary> 522 /// </summary>
523 /// <param name="obj">The object being removed from the scene</param>
445 public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj); 524 public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj);
525
526 /// <summary>
527 /// Triggered when an object is removed from the scene.
528 /// </summary>
529 /// <remarks>
530 /// Triggered by <see cref="TriggerObjectBeingRemovedFromScene"/>
531 /// in <see cref="Scene.DeleteSceneObject"/>
532 /// </remarks>
446 public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene; 533 public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene;
447 534
448 public delegate void NoticeNoLandDataFromStorage(); 535 public delegate void NoticeNoLandDataFromStorage();
@@ -628,9 +715,28 @@ namespace OpenSim.Region.Framework.Scenes
628 public event PrimsLoaded OnPrimsLoaded; 715 public event PrimsLoaded OnPrimsLoaded;
629 716
630 public delegate void TeleportStart(IClientAPI client, GridRegion destination, GridRegion finalDestination, uint teleportFlags, bool gridLogout); 717 public delegate void TeleportStart(IClientAPI client, GridRegion destination, GridRegion finalDestination, uint teleportFlags, bool gridLogout);
718
719 /// <summary>
720 /// Triggered when a teleport starts
721 /// </summary>
722 /// <remarks>
723 /// Triggered by <see cref="TriggerTeleportStart"/>
724 /// in <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.CreateAgent"/>
725 /// and <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule.CreateAgent"/>
726 /// via <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.DoTeleport"/>
727 /// </remarks>
631 public event TeleportStart OnTeleportStart; 728 public event TeleportStart OnTeleportStart;
632 729
633 public delegate void TeleportFail(IClientAPI client, bool gridLogout); 730 public delegate void TeleportFail(IClientAPI client, bool gridLogout);
731
732 /// <summary>
733 /// Trigered when a teleport fails.
734 /// </summary>
735 /// <remarks>
736 /// Triggered by <see cref="TriggerTeleportFail"/>
737 /// in <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.Fail"/>
738 /// via <see cref="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule.DoTeleport"/>
739 /// </remarks>
634 public event TeleportFail OnTeleportFail; 740 public event TeleportFail OnTeleportFail;
635 741
636 public class MoneyTransferArgs : EventArgs 742 public class MoneyTransferArgs : EventArgs
@@ -638,7 +744,9 @@ namespace OpenSim.Region.Framework.Scenes
638 public UUID sender; 744 public UUID sender;
639 public UUID receiver; 745 public UUID receiver;
640 746
641 // Always false. The SL protocol sucks. 747 /// <summary>
748 /// Always false. The SL protocol sucks.
749 /// </summary>
642 public bool authenticated = false; 750 public bool authenticated = false;
643 751
644 public int amount; 752 public int amount;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c873cdf..e9d1d42 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -861,6 +861,8 @@ namespace OpenSim.Region.Framework.Scenes
861 } 861 }
862 862
863 // FIXME: Ultimately this should be in a module. 863 // FIXME: Ultimately this should be in a module.
864 SendPeriodicAppearanceUpdates = true;
865
864 IConfig appearanceConfig = m_config.Configs["Appearance"]; 866 IConfig appearanceConfig = m_config.Configs["Appearance"];
865 if (appearanceConfig != null) 867 if (appearanceConfig != null)
866 { 868 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index ca956fb..a014798 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -231,12 +231,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
231 if (m_server == null || m_baseNick == null || m_ircChannel == null || m_user == null) 231 if (m_server == null || m_baseNick == null || m_ircChannel == null || m_user == null)
232 throw new Exception("Invalid connector configuration"); 232 throw new Exception("Invalid connector configuration");
233 233
234 // Generate an initial nickname if randomizing is enabled 234 // Generate an initial nickname
235 235
236 if (m_randomizeNick) 236 if (m_randomizeNick)
237 {
238 m_nick = m_baseNick + Util.RandomClass.Next(1, 99); 237 m_nick = m_baseNick + Util.RandomClass.Next(1, 99);
239 } 238 else
239 m_nick = m_baseNick;
240 240
241 m_log.InfoFormat("[IRC-Connector-{0}]: Initialization complete", idn); 241 m_log.InfoFormat("[IRC-Connector-{0}]: Initialization complete", idn);
242 242