diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
5 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 675c64d..3b59dc4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
93 | /// </summary> | 93 | /// </summary> |
94 | public void StartScripts() | 94 | public void StartScripts() |
95 | { | 95 | { |
96 | m_log.InfoFormat("[SCENE]: Starting scripts in {0}, please wait.", RegionInfo.RegionName); | 96 | // m_log.InfoFormat("[SCENE]: Starting scripts in {0}, please wait.", RegionInfo.RegionName); |
97 | 97 | ||
98 | IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>(); | 98 | IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>(); |
99 | 99 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 2701d6e..6e53951 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -468,7 +468,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
468 | if (!InventoryService.AddFolder(folder)) | 468 | if (!InventoryService.AddFolder(folder)) |
469 | { | 469 | { |
470 | m_log.WarnFormat( | 470 | m_log.WarnFormat( |
471 | "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}", | 471 | "[AGENT INVENTORY]: Failed to create folder for user {0} {1}", |
472 | remoteClient.Name, remoteClient.AgentId); | 472 | remoteClient.Name, remoteClient.AgentId); |
473 | } | 473 | } |
474 | } | 474 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ad74189..2b4dea4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3562,7 +3562,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3562 | "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", | 3562 | "[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.", |
3563 | sp.Name, sp.UUID, RegionInfo.RegionName); | 3563 | sp.Name, sp.UUID, RegionInfo.RegionName); |
3564 | 3564 | ||
3565 | sp.ControllingClient.Close(); | 3565 | sp.ControllingClient.Close(true); |
3566 | sp = null; | 3566 | sp = null; |
3567 | } | 3567 | } |
3568 | 3568 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index b6339fb..209a770 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
300 | public bool AddNewSceneObject( | 300 | public bool AddNewSceneObject( |
301 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel) | 301 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3? pos, Quaternion? rot, Vector3 vel) |
302 | { | 302 | { |
303 | AddNewSceneObject(sceneObject, true, false); | 303 | AddNewSceneObject(sceneObject, attachToBackup, false); |
304 | 304 | ||
305 | if (pos != null) | 305 | if (pos != null) |
306 | sceneObject.AbsolutePosition = (Vector3)pos; | 306 | sceneObject.AbsolutePosition = (Vector3)pos; |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 65d526f..5bf69ad 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -891,7 +891,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
891 | { | 891 | { |
892 | if (wasChild && HasAttachments()) | 892 | if (wasChild && HasAttachments()) |
893 | { | 893 | { |
894 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); | 894 | m_log.DebugFormat( |
895 | "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name); | ||
896 | |||
895 | // Resume scripts | 897 | // Resume scripts |
896 | foreach (SceneObjectGroup sog in m_attachments) | 898 | foreach (SceneObjectGroup sog in m_attachments) |
897 | { | 899 | { |