Merge branch 'master' into careminster-presence-refactor

2 files changed, 17 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index b823fec..7ae304c 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -66,8 +66,8 @@ namespace OpenSim.Region.CoreModules.Framework
             m_scene = scene;
             m_scene.RegisterModuleInterface<ICapabilitiesModule>(this);
             MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps",
-                "show capabilities",
-                "Shows all  registered capabilities", CapabilitiesCommand);
+                "show caps",
+                "Shows all registered capabilities", CapabilitiesCommand);
         }
 
         public void RegionLoaded(Scene scene)
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 8775ea1..0e5953e 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -911,6 +911,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
                 {
                     // region doesn't take it
+                    ReInstantiateScripts(agent);
                     ResetFromTransit(agent.UUID);
                     return agent;
                 }
@@ -1787,14 +1788,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         protected void ReInstantiateScripts(ScenePresence sp)
         {
             int i = 0;
-            sp.Attachments.ForEach(delegate(SceneObjectGroup sog)
+            if (sp.InTransitScriptStates.Count > 0)
             {
-                sog.SetState(sp.InTransitScriptStates[i++], sp.Scene);
-                sog.CreateScriptInstances(0, false, sp.Scene.DefaultScriptEngine, 0);
-                sog.ResumeScripts();
-            });
+                sp.Attachments.ForEach(delegate(SceneObjectGroup sog)
+                {
+                    if (i < sp.InTransitScriptStates.Count)
+                    {
+                        sog.SetState(sp.InTransitScriptStates[i++], sp.Scene);
+                        sog.CreateScriptInstances(0, false, sp.Scene.DefaultScriptEngine, 0);
+                        sog.ResumeScripts();
+                    }
+                    else
+                        m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: InTransitScriptStates.Count={0} smaller than Attachments.Count={1}", sp.InTransitScriptStates.Count, sp.Attachments.Count);
+                });
 
-            sp.InTransitScriptStates.Clear();
+                sp.InTransitScriptStates.Clear();
+            }
         }
         #endregion