diff options
| author | Melanie | 2009-11-28 09:23:26 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-28 09:23:26 +0000 |
| commit | 9fd9211a3868b78c0fe7a8672d563f5a346dc955 (patch) | |
| tree | a963bf0251df5db959ce7d9c75d5acc3de121cf3 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC-9fd9211a3868b78c0fe7a8672d563f5a346dc955.zip opensim-SC-9fd9211a3868b78c0fe7a8672d563f5a346dc955.tar.gz opensim-SC-9fd9211a3868b78c0fe7a8672d563f5a346dc955.tar.bz2 opensim-SC-9fd9211a3868b78c0fe7a8672d563f5a346dc955.tar.xz | |
Add some conditionals to references to the WorldComm module, so that the
module can be disabled without crashing the sim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 9d97cb2..ee32755 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
| @@ -236,7 +236,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 236 | iHttpReq.StopHttpRequest(localID, itemID); | 236 | iHttpReq.StopHttpRequest(localID, itemID); |
| 237 | 237 | ||
| 238 | IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); | 238 | IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); |
| 239 | comms.DeleteListener(itemID); | 239 | if (comms != null) |
| 240 | comms.DeleteListener(itemID); | ||
| 240 | 241 | ||
| 241 | IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>(); | 242 | IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>(); |
| 242 | xmlrpc.DeleteChannels(itemID); | 243 | xmlrpc.DeleteChannels(itemID); |