Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-05-03 14:26:18 +01:00
6 changed files with 32 additions and 34 deletions

View File

@@ -1077,7 +1077,7 @@ namespace OpenSim.Region.Framework.Scenes
// and it has already rezzed the attachments and started their scripts.
// We do the following only for non-login agents, because their scripts
// haven't started yet.
if (wasChild)
if (wasChild && Attachments != null && Attachments.Count > 0)
{
m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments...");
// Resume scripts