diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 8390f64..7d048a3 100644 --- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
70 | obj.ResetIDs(); | 70 | obj.ResetIDs(); |
71 | } | 71 | } |
72 | //if we want this to be a import method then we need new uuids for the object to avoid any clashes | 72 | //if we want this to be a import method then we need new uuids for the object to avoid any clashes |
73 | //obj.RegenerateFullIDs(); | 73 | //obj.RegenerateFullIDs(); |
74 | m_innerScene.AddEntity(obj); | 74 | m_innerScene.AddEntity(obj); |
75 | 75 | ||
76 | SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); | 76 | SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); |
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
143 | { | 143 | { |
144 | XmlDocument doc = new XmlDocument(); | 144 | XmlDocument doc = new XmlDocument(); |
145 | XmlNode rootNode; | 145 | XmlNode rootNode; |
146 | 146 | ||
147 | XmlTextReader reader = new XmlTextReader(new StringReader(xmlString)); | 147 | XmlTextReader reader = new XmlTextReader(new StringReader(xmlString)); |
148 | reader.WhitespaceHandling = WhitespaceHandling.None; | 148 | reader.WhitespaceHandling = WhitespaceHandling.None; |
149 | doc.Load(reader); | 149 | doc.Load(reader); |
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
153 | { | 153 | { |
154 | CreatePrimFromXml(aPrimNode.OuterXml); | 154 | CreatePrimFromXml(aPrimNode.OuterXml); |
155 | } | 155 | } |
156 | 156 | ||
157 | } | 157 | } |
158 | 158 | ||
159 | public void LoadPrimsFromXml2(string fileName) | 159 | public void LoadPrimsFromXml2(string fileName) |
@@ -206,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
206 | rootPart.PhysActor.LocalID = rootPart.LocalId; | 206 | rootPart.PhysActor.LocalID = rootPart.LocalId; |
207 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); | 207 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); |
208 | } | 208 | } |
209 | rootPart.Velocity = receivedVelocity; | 209 | rootPart.Velocity = receivedVelocity; |
210 | } | 210 | } |
211 | 211 | ||
212 | obj.ScheduleGroupForFullUpdate(); | 212 | obj.ScheduleGroupForFullUpdate(); |