aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-16 08:45:52 +0000
committerMelanie Thielker2009-07-16 08:45:52 +0000
commitb79e23dc5c51f21736021d9646d5584ce7b96ee0 (patch)
treeea8b6c61cec5bf8ca851b3ddc1d0ceb3b3ec553a
parent* Tweaking collision reporting a little more in ScenePresence to not check if... (diff)
downloadopensim-SC_OLD-b79e23dc5c51f21736021d9646d5584ce7b96ee0.zip
opensim-SC_OLD-b79e23dc5c51f21736021d9646d5584ce7b96ee0.tar.gz
opensim-SC_OLD-b79e23dc5c51f21736021d9646d5584ce7b96ee0.tar.bz2
opensim-SC_OLD-b79e23dc5c51f21736021d9646d5584ce7b96ee0.tar.xz
Allow OpenSim to run without script engines enabled
Fixes Mantis #3893
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 73935d1..084aa50 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -862,6 +862,8 @@ namespace OpenSim.Region.Framework.Scenes
862 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); 862 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
863 863
864 List<string> ret = new List<string>(); 864 List<string> ret = new List<string>();
865 if (engines == null) // No engine at all
866 return new string[0];
865 867
866 foreach (TaskInventoryItem item in m_items.Values) 868 foreach (TaskInventoryItem item in m_items.Values)
867 { 869 {
@@ -885,7 +887,10 @@ namespace OpenSim.Region.Framework.Scenes
885 public Dictionary<UUID, string> GetScriptStates() 887 public Dictionary<UUID, string> GetScriptStates()
886 { 888 {
887 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); 889 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
890
888 Dictionary<UUID, string> ret = new Dictionary<UUID, string>(); 891 Dictionary<UUID, string> ret = new Dictionary<UUID, string>();
892 if (engines == null) // No engine at all
893 return ret;
889 894
890 foreach (TaskInventoryItem item in m_items.Values) 895 foreach (TaskInventoryItem item in m_items.Values)
891 { 896 {