aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-03 22:58:58 +0100
committerJustin Clark-Casey (justincc)2012-07-03 22:58:58 +0100
commit3c9b9a848f6c9723a3cc46f0de8ad802ece7e2a7 (patch)
treeafb1261f72b45d5895c5bd52593c9c99ba44960f /OpenSim/Region/Framework
parentAdds a list of viewers that are allowed or banned from the region. (diff)
downloadopensim-SC_OLD-3c9b9a848f6c9723a3cc46f0de8ad802ece7e2a7.zip
opensim-SC_OLD-3c9b9a848f6c9723a3cc46f0de8ad802ece7e2a7.tar.gz
opensim-SC_OLD-3c9b9a848f6c9723a3cc46f0de8ad802ece7e2a7.tar.bz2
opensim-SC_OLD-3c9b9a848f6c9723a3cc46f0de8ad802ece7e2a7.tar.xz
Fix issue in database tests where sogs being stored are not in a scene.
This puts an extra m_part.ParentGroup.Scene == null check at the top of SceneObjectPartInventory.QueryScriptStates()
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 6427014..866311a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -220,7 +220,7 @@ namespace OpenSim.Region.Framework.Scenes
220 220
221 private void QueryScriptStates() 221 private void QueryScriptStates()
222 { 222 {
223 if (m_part == null || m_part.ParentGroup == null) 223 if (m_part == null || m_part.ParentGroup == null || m_part.ParentGroup.Scene == null)
224 return; 224 return;
225 225
226 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); 226 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();