diff options
| author | UbitUmarov | 2012-11-24 03:39:37 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-11-24 03:39:37 +0000 |
| commit | f254af29ac88c2aa073d604c89709b4abca9a2f1 (patch) | |
| tree | 7abcbbbf9041397ed3b54f10a6228507c93e7de2 /OpenSim/Region | |
| parent | Remove a superfluous newline from help (diff) | |
| download | opensim-SC_OLD-f254af29ac88c2aa073d604c89709b4abca9a2f1.zip opensim-SC_OLD-f254af29ac88c2aa073d604c89709b4abca9a2f1.tar.gz opensim-SC_OLD-f254af29ac88c2aa073d604c89709b4abca9a2f1.tar.bz2 opensim-SC_OLD-f254af29ac88c2aa073d604c89709b4abca9a2f1.tar.xz | |
avoid potencial NullReferenceException
Diffstat (limited to 'OpenSim/Region')
| -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); |