diff options
author | Melanie Thielker | 2010-09-06 03:59:48 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-06 03:59:48 +0200 |
commit | 00a23eea0ec5d3607cf9cd021a3a182da258686e (patch) | |
tree | 012e54645dfb70c67e4af2912526b347c4bbf593 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-00a23eea0ec5d3607cf9cd021a3a182da258686e.zip opensim-SC_OLD-00a23eea0ec5d3607cf9cd021a3a182da258686e.tar.gz opensim-SC_OLD-00a23eea0ec5d3607cf9cd021a3a182da258686e.tar.bz2 opensim-SC_OLD-00a23eea0ec5d3607cf9cd021a3a182da258686e.tar.xz |
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
modules need to see it (Search!) even if it comes in via CAPS
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 52e6e92..d4e2736 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -113,6 +113,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
113 | 113 | ||
114 | public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; | 114 | public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; |
115 | 115 | ||
116 | public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest; | ||
117 | |||
116 | /// <summary> | 118 | /// <summary> |
117 | /// Fired when an object is touched/grabbed. | 119 | /// Fired when an object is touched/grabbed. |
118 | /// </summary> | 120 | /// </summary> |
@@ -2128,5 +2130,27 @@ namespace OpenSim.Region.Framework.Scenes | |||
2128 | } | 2130 | } |
2129 | } | 2131 | } |
2130 | } | 2132 | } |
2133 | |||
2134 | public void TriggerOnParcelPropertiesUpdateRequest(LandUpdateArgs args, | ||
2135 | int local_id, IClientAPI remote_client) | ||
2136 | { | ||
2137 | ParcelPropertiesUpdateRequest handler = OnParcelPropertiesUpdateRequest; | ||
2138 | if (handler != null) | ||
2139 | { | ||
2140 | foreach (ParcelPropertiesUpdateRequest d in handler.GetInvocationList()) | ||
2141 | { | ||
2142 | try | ||
2143 | { | ||
2144 | d(args, local_id, remote_client); | ||
2145 | } | ||
2146 | catch (Exception e) | ||
2147 | { | ||
2148 | m_log.ErrorFormat( | ||
2149 | "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing. {0} {1}", | ||
2150 | e.Message, e.StackTrace); | ||
2151 | } | ||
2152 | } | ||
2153 | } | ||
2154 | } | ||
2131 | } | 2155 | } |
2132 | } \ No newline at end of file | 2156 | } |