diff options
author | Adam Frisby | 2008-05-01 16:35:00 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 16:35:00 +0000 |
commit | 13526097f24b7a8ad63b1d482c44b44397fa055f (patch) | |
tree | 7a82c20ed7c63e2aea5ad3863325e37f64e1cbea /OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |
parent | * Breaking all the code, breaking all the code..! (diff) | |
download | opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.zip opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.gz opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.bz2 opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.xz |
* Spring cleaning on Region.Environment.
* Converted a large number of read-only fields to be actually, readonly.
* Reformatted code sections.
* Removed redundant code.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 8390f64..386d87b 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 RegionInfo m_regInfo; | ||
43 | protected Scene m_parentScene; | 42 | protected Scene m_parentScene; |
43 | protected RegionInfo m_regInfo; | ||
44 | 44 | ||
45 | public SceneXmlLoader(Scene parentScene, InnerScene innerScene, RegionInfo regionInfo) | 45 | public SceneXmlLoader(Scene parentScene, InnerScene innerScene, RegionInfo regionInfo) |
46 | { | 46 | { |
@@ -136,14 +136,13 @@ 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 | |||
140 | } | 139 | } |
141 | 140 | ||
142 | public void LoadGroupFromXml2String(string xmlString) | 141 | public void LoadGroupFromXml2String(string xmlString) |
143 | { | 142 | { |
144 | XmlDocument doc = new XmlDocument(); | 143 | XmlDocument doc = new XmlDocument(); |
145 | XmlNode rootNode; | 144 | XmlNode rootNode; |
146 | 145 | ||
147 | XmlTextReader reader = new XmlTextReader(new StringReader(xmlString)); | 146 | XmlTextReader reader = new XmlTextReader(new StringReader(xmlString)); |
148 | reader.WhitespaceHandling = WhitespaceHandling.None; | 147 | reader.WhitespaceHandling = WhitespaceHandling.None; |
149 | doc.Load(reader); | 148 | doc.Load(reader); |
@@ -153,7 +152,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
153 | { | 152 | { |
154 | CreatePrimFromXml(aPrimNode.OuterXml); | 153 | CreatePrimFromXml(aPrimNode.OuterXml); |
155 | } | 154 | } |
156 | |||
157 | } | 155 | } |
158 | 156 | ||
159 | public void LoadPrimsFromXml2(string fileName) | 157 | public void LoadPrimsFromXml2(string fileName) |
@@ -206,7 +204,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
206 | rootPart.PhysActor.LocalID = rootPart.LocalId; | 204 | rootPart.PhysActor.LocalID = rootPart.LocalId; |
207 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); | 205 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); |
208 | } | 206 | } |
209 | rootPart.Velocity = receivedVelocity; | 207 | rootPart.Velocity = receivedVelocity; |
210 | } | 208 | } |
211 | 209 | ||
212 | obj.ScheduleGroupForFullUpdate(); | 210 | obj.ScheduleGroupForFullUpdate(); |
@@ -234,4 +232,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
234 | file.Close(); | 232 | file.Close(); |
235 | } | 233 | } |
236 | } | 234 | } |
237 | } | 235 | } \ No newline at end of file |