diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 386d87b..8390f64 100644 --- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |||
@@ -39,8 +39,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
39 | public class SceneXmlLoader // can move to a module? | 39 | public class SceneXmlLoader // can move to a module? |
40 | { | 40 | { |
41 | protected InnerScene m_innerScene; | 41 | protected InnerScene m_innerScene; |
42 | protected Scene m_parentScene; | ||
43 | protected RegionInfo m_regInfo; | 42 | protected RegionInfo m_regInfo; |
43 | protected Scene m_parentScene; | ||
44 | 44 | ||
45 | public SceneXmlLoader(Scene parentScene, InnerScene innerScene, RegionInfo regionInfo) | 45 | public SceneXmlLoader(Scene parentScene, InnerScene innerScene, RegionInfo regionInfo) |
46 | { | 46 | { |
@@ -136,13 +136,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
136 | returnstring += grp.ToXmlString2(); | 136 | returnstring += grp.ToXmlString2(); |
137 | returnstring += "</scene>\n"; | 137 | returnstring += "</scene>\n"; |
138 | return returnstring; | 138 | return returnstring; |
139 | |||
139 | } | 140 | } |
140 | 141 | ||
141 | public void LoadGroupFromXml2String(string xmlString) | 142 | public void LoadGroupFromXml2String(string xmlString) |
142 | { | 143 | { |
143 | XmlDocument doc = new XmlDocument(); | 144 | XmlDocument doc = new XmlDocument(); |
144 | XmlNode rootNode; | 145 | XmlNode rootNode; |
145 | 146 | ||
146 | XmlTextReader reader = new XmlTextReader(new StringReader(xmlString)); | 147 | XmlTextReader reader = new XmlTextReader(new StringReader(xmlString)); |
147 | reader.WhitespaceHandling = WhitespaceHandling.None; | 148 | reader.WhitespaceHandling = WhitespaceHandling.None; |
148 | doc.Load(reader); | 149 | doc.Load(reader); |
@@ -152,6 +153,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
152 | { | 153 | { |
153 | CreatePrimFromXml(aPrimNode.OuterXml); | 154 | CreatePrimFromXml(aPrimNode.OuterXml); |
154 | } | 155 | } |
156 | |||
155 | } | 157 | } |
156 | 158 | ||
157 | public void LoadPrimsFromXml2(string fileName) | 159 | public void LoadPrimsFromXml2(string fileName) |
@@ -204,7 +206,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
204 | rootPart.PhysActor.LocalID = rootPart.LocalId; | 206 | rootPart.PhysActor.LocalID = rootPart.LocalId; |
205 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); | 207 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); |
206 | } | 208 | } |
207 | rootPart.Velocity = receivedVelocity; | 209 | rootPart.Velocity = receivedVelocity; |
208 | } | 210 | } |
209 | 211 | ||
210 | obj.ScheduleGroupForFullUpdate(); | 212 | obj.ScheduleGroupForFullUpdate(); |
@@ -232,4 +234,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
232 | file.Close(); | 234 | file.Close(); |
233 | } | 235 | } |
234 | } | 236 | } |
235 | } \ No newline at end of file | 237 | } |