diff options
author | Melanie | 2012-08-25 18:08:10 +0100 |
---|---|---|
committer | Melanie | 2012-08-25 18:08:10 +0100 |
commit | 007a45aa76af0029a43b634a0a44a48f15ea5654 (patch) | |
tree | 5a5202f11b7b54953ea462d70a25dec77502f5eb /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ca... (diff) | |
download | opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.zip opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.gz opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.bz2 opensim-SC-007a45aa76af0029a43b634a0a44a48f15ea5654.tar.xz |
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cfd4a51..3e8c7e5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -974,7 +974,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
974 | { | 974 | { |
975 | if (wasChild && HasAttachments()) | 975 | if (wasChild && HasAttachments()) |
976 | { | 976 | { |
977 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); | 977 | m_log.DebugFormat( |
978 | "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name); | ||
979 | |||
978 | // Resume scripts | 980 | // Resume scripts |
979 | Util.FireAndForget(delegate(object x) { | 981 | Util.FireAndForget(delegate(object x) { |
980 | foreach (SceneObjectGroup sog in m_attachments) | 982 | foreach (SceneObjectGroup sog in m_attachments) |