diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index 1c7cd7e..60387c6 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | |||
@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
172 | SceneObjectGroup so = new SceneObjectGroup(rp); | 172 | SceneObjectGroup so = new SceneObjectGroup(rp); |
173 | 173 | ||
174 | // Need to add the object to the scene so that the request to get script state succeeds | 174 | // Need to add the object to the scene so that the request to get script state succeeds |
175 | m_scene.AddSceneObject(UUID.Zero, so); | 175 | m_scene.AddSceneObject(so); |
176 | 176 | ||
177 | string xml2 = m_serialiserModule.SaveGroupToXml2(so); | 177 | string xml2 = m_serialiserModule.SaveGroupToXml2(so); |
178 | 178 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 28d5bad..842bf1e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1663,14 +1663,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1663 | /// <returns></returns> | 1663 | /// <returns></returns> |
1664 | public bool IncomingInterRegionPrimGroup(UUID primID, string objXMLData, int XMLMethod) | 1664 | public bool IncomingInterRegionPrimGroup(UUID primID, string objXMLData, int XMLMethod) |
1665 | { | 1665 | { |
1666 | |||
1667 | if (XMLMethod == 0) | 1666 | if (XMLMethod == 0) |
1668 | { | 1667 | { |
1669 | m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID); | 1668 | m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID); |
1670 | SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); | 1669 | SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); |
1671 | 1670 | ||
1672 | return AddSceneObject(primID, sceneObject); | 1671 | return AddSceneObject(sceneObject); |
1673 | |||
1674 | } | 1672 | } |
1675 | else if ((XMLMethod == 100) && m_allowScriptCrossings) | 1673 | else if ((XMLMethod == 100) && m_allowScriptCrossings) |
1676 | { | 1674 | { |
@@ -1763,7 +1761,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1763 | return false; | 1761 | return false; |
1764 | } | 1762 | } |
1765 | 1763 | ||
1766 | if (!AddSceneObject(newObject.UUID, newObject)) | 1764 | if (!AddSceneObject(newObject)) |
1767 | { | 1765 | { |
1768 | m_log.DebugFormat("[SCENE]: Problem adding scene object {0} in {1} ", sog.UUID, RegionInfo.RegionName); | 1766 | m_log.DebugFormat("[SCENE]: Problem adding scene object {0} in {1} ", sog.UUID, RegionInfo.RegionName); |
1769 | return false; | 1767 | return false; |
@@ -1784,7 +1782,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1784 | return false; | 1782 | return false; |
1785 | } | 1783 | } |
1786 | 1784 | ||
1787 | public bool AddSceneObject(UUID primID, SceneObjectGroup sceneObject) | 1785 | public bool AddSceneObject(SceneObjectGroup sceneObject) |
1788 | { | 1786 | { |
1789 | // If the user is banned, we won't let any of their objects | 1787 | // If the user is banned, we won't let any of their objects |
1790 | // enter. Period. | 1788 | // enter. Period. |
@@ -1810,12 +1808,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1810 | AddRestoredSceneObject(sceneObject, false, false); | 1808 | AddRestoredSceneObject(sceneObject, false, false); |
1811 | 1809 | ||
1812 | // Handle attachment special case | 1810 | // Handle attachment special case |
1813 | // | ||
1814 | //SceneObjectPart RootPrim = GetSceneObjectPart(primID); | ||
1815 | SceneObjectPart RootPrim = sceneObject.RootPart; | 1811 | SceneObjectPart RootPrim = sceneObject.RootPart; |
1816 | 1812 | ||
1817 | // Fix up attachment Parent Local ID | 1813 | // Fix up attachment Parent Local ID |
1818 | // | ||
1819 | ScenePresence sp = GetScenePresence(sceneObject.OwnerID); | 1814 | ScenePresence sp = GetScenePresence(sceneObject.OwnerID); |
1820 | 1815 | ||
1821 | //uint parentLocalID = 0; | 1816 | //uint parentLocalID = 0; |