Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim

author: dahlia 2009-11-30 01:09:46 -0800
committer: dahlia 2009-11-30 01:09:46 -0800
commit: 5b0bb1eff97065a5e02d8fed757bb71f9262595f (patch)
tree: 75901727de505d71cb799a96dfaa27fa43031c29 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
parent: add agent position to output of "show users" console command (diff)
parent: * Patch from Misterblue to fix Environment.TickCount for statistics purposes.... (diff)
download: opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.zip
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.gz
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.bz2
opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.xz
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
            iHttpReq.StopHttpRequest(localID, itemID);
            IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
-            comms.DeleteListener(itemID);
+            if (comms != null)
+                comms.DeleteListener(itemID);
            IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
            xmlrpc.DeleteChannels(itemID);
author	dahlia	2009-11-30 01:09:46 -0800
committer	dahlia	2009-11-30 01:09:46 -0800
commit	5b0bb1eff97065a5e02d8fed757bb71f9262595f (patch)
tree	75901727de505d71cb799a96dfaa27fa43031c29 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
parent	add agent position to output of "show users" console command (diff)
parent	* Patch from Misterblue to fix Environment.TickCount for statistics purposes.... (diff)
download	opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.zip opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.gz opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.bz2 opensim-SC-5b0bb1eff97065a5e02d8fed757bb71f9262595f.tar.xz

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);