diff options
| author | Diva Canto | 2011-05-01 09:11:16 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-05-01 09:11:16 -0700 |
| commit | f0bf64b6debf85440a823816b725dee7d41cedac (patch) | |
| tree | ba4155810f2b27a8e3220214d92ecd7faa0cc069 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTextur... (diff) | |
| parent | Increased Timeout to 30 secs. (diff) | |
| download | opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.zip opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.gz opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.bz2 opensim-SC_OLD-f0bf64b6debf85440a823816b725dee7d41cedac.tar.xz | |
Merge branch 'master' into caps
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1aac09d..5b86735 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -937,7 +937,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 937 | // and it has already rezzed the attachments and started their scripts. | 937 | // and it has already rezzed the attachments and started their scripts. |
| 938 | // We do the following only for non-login agents, because their scripts | 938 | // We do the following only for non-login agents, because their scripts |
| 939 | // haven't started yet. | 939 | // haven't started yet. |
| 940 | if (wasChild) | 940 | if (wasChild && Attachments != null && Attachments.Count > 0) |
| 941 | { | 941 | { |
| 942 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); | 942 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); |
| 943 | // Resume scripts | 943 | // Resume scripts |