diff options
| author | Melanie | 2012-12-18 09:48:12 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:48:12 +0000 |
| commit | 79bdf464d3f123f8e195fa57c497e546b7d9dfcc (patch) | |
| tree | bf6123b15d1ced7ec72ce871e4801d6645bb23f4 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix locking for good (diff) | |
| download | opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.zip opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.gz opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.bz2 opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 94fd940..6879ebb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
| @@ -317,8 +317,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 317 | comms.DeleteListener(itemID); | 317 | comms.DeleteListener(itemID); |
| 318 | 318 | ||
| 319 | IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>(); | 319 | IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>(); |
| 320 | xmlrpc.DeleteChannels(itemID); | 320 | if (xmlrpc != null) |
| 321 | xmlrpc.CancelSRDRequests(itemID); | 321 | { |
| 322 | xmlrpc.DeleteChannels(itemID); | ||
| 323 | xmlrpc.CancelSRDRequests(itemID); | ||
| 324 | } | ||
| 322 | 325 | ||
| 323 | // Remove Sensors | 326 | // Remove Sensors |
| 324 | m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID); | 327 | m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID); |