Merge branch 'master' into careminster

author: Melanie 2009-11-28 09:26:00 +0000
committer: Melanie 2009-11-28 09:26:00 +0000
commit: d3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch)
tree: 044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
parent: Reset update flag when a SOG is deleted. This fixes llDie(); (diff)
parent: Add some conditionals to references to the WorldComm module, so that the (diff)
download: opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2
opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.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	Melanie	2009-11-28 09:26:00 +0000
committer	Melanie	2009-11-28 09:26:00 +0000
commit	d3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch)
tree	044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
parent	Reset update flag when a SOG is deleted. This fixes llDie(); (diff)
parent	Add some conditionals to references to the WorldComm module, so that the (diff)
download	opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2 opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.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);