diff options
author | Melanie Thielker | 2015-11-12 20:34:09 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-11-12 20:34:09 +0100 |
commit | d3911606ef7bf1335eb4ef01fc6f9d2171daf094 (patch) | |
tree | 049196cc49c77d29065c5b7005a8f5eb29eded2d /OpenSim/Region | |
parent | dont abort llDialog if buttons labels are longer than 24bytes, let udp trunca... (diff) | |
download | opensim-SC_OLD-d3911606ef7bf1335eb4ef01fc6f9d2171daf094.zip opensim-SC_OLD-d3911606ef7bf1335eb4ef01fc6f9d2171daf094.tar.gz opensim-SC_OLD-d3911606ef7bf1335eb4ef01fc6f9d2171daf094.tar.bz2 opensim-SC_OLD-d3911606ef7bf1335eb4ef01fc6f9d2171daf094.tar.xz |
Move a call to RequestModuleInterface to a new scene callback function
because the current implementation would have always returned null
Diffstat (limited to 'OpenSim/Region')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4e629da..32b45ac 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1243,13 +1243,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
1243 | get { return m_sceneGraph; } | 1243 | get { return m_sceneGraph; } |
1244 | } | 1244 | } |
1245 | 1245 | ||
1246 | protected virtual void RegisterDefaultSceneEvents() | 1246 | /// <summary> |
1247 | /// Called by the module loader when all modules are loaded, after each module's | ||
1248 | /// RegionLoaded hook is called. This is the earliest time where RequestModuleInterface | ||
1249 | /// may be used. | ||
1250 | /// </summary> | ||
1251 | public void AllModulesLoaded() | ||
1247 | { | 1252 | { |
1248 | IDialogModule dm = RequestModuleInterface<IDialogModule>(); | 1253 | IDialogModule dm = RequestModuleInterface<IDialogModule>(); |
1249 | 1254 | ||
1250 | if (dm != null) | 1255 | if (dm != null) |
1251 | m_eventManager.OnPermissionError += dm.SendAlertToUser; | 1256 | m_eventManager.OnPermissionError += dm.SendAlertToUser; |
1257 | } | ||
1252 | 1258 | ||
1259 | protected virtual void RegisterDefaultSceneEvents() | ||
1260 | { | ||
1253 | m_eventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement; | 1261 | m_eventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement; |
1254 | } | 1262 | } |
1255 | 1263 | ||