diff options
author | Melanie | 2011-03-14 14:48:00 +0000 |
---|---|---|
committer | Melanie | 2011-03-14 14:48:00 +0000 |
commit | 3dc877c59f2e257a07bae6b558bdf79a4cee1de8 (patch) | |
tree | 7e6ed75f380ca42261e9de0529eb6462bec74db2 /OpenSim/Region/Framework/Scenes | |
parent | Up the timeout on slow requests to 3000 to stop console spam. Make sure (diff) | |
parent | factor inventory file loading into its own method (diff) | |
download | opensim-SC-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.zip opensim-SC-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.gz opensim-SC-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.bz2 opensim-SC-3dc877c59f2e257a07bae6b558bdf79a4cee1de8.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 7e59b10..854f1dc 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -1287,9 +1287,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1287 | 1287 | ||
1288 | public Dictionary<UUID, string> GetScriptStates(bool oldIDs) | 1288 | public Dictionary<UUID, string> GetScriptStates(bool oldIDs) |
1289 | { | 1289 | { |
1290 | Dictionary<UUID, string> ret = new Dictionary<UUID, string>(); | ||
1291 | |||
1292 | if (m_part.ParentGroup.Scene == null) // Group not in a scene | ||
1293 | return ret; | ||
1294 | |||
1290 | IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); | 1295 | IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>(); |
1291 | 1296 | ||
1292 | Dictionary<UUID, string> ret = new Dictionary<UUID, string>(); | ||
1293 | if (engines == null) // No engine at all | 1297 | if (engines == null) // No engine at all |
1294 | return ret; | 1298 | return ret; |
1295 | 1299 | ||