diff options
author | Jeff Ames | 2008-05-25 23:27:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-25 23:27:38 +0000 |
commit | 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch) | |
tree | b010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region/Environment/Scenes/SceneManager.cs | |
parent | * A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff) | |
download | opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2 opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneManager.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index eae041b..66174bf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
176 | { | 176 | { |
177 | CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset); | 177 | CurrentOrFirstScene.LoadPrimsFromXml(filename, generateNewIDs, loadOffset); |
178 | } | 178 | } |
179 | 179 | ||
180 | /// <summary> | 180 | /// <summary> |
181 | /// Save the prims in the current scene to an xml file in OpenSimulator's current 'xml2' format | 181 | /// Save the prims in the current scene to an xml file in OpenSimulator's current 'xml2' format |
182 | /// </summary> | 182 | /// </summary> |
@@ -188,12 +188,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
188 | 188 | ||
189 | /// <summary> | 189 | /// <summary> |
190 | /// Load an xml file of prims in OpenSimulator's current 'xml2' file format to the current scene | 190 | /// Load an xml file of prims in OpenSimulator's current 'xml2' file format to the current scene |
191 | /// </summary> | 191 | /// </summary> |
192 | public void LoadCurrentSceneFromXml2(string filename) | 192 | public void LoadCurrentSceneFromXml2(string filename) |
193 | { | 193 | { |
194 | CurrentOrFirstScene.LoadPrimsFromXml2(filename); | 194 | CurrentOrFirstScene.LoadPrimsFromXml2(filename); |
195 | } | 195 | } |
196 | 196 | ||
197 | /// <summary> | 197 | /// <summary> |
198 | /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets | 198 | /// Save the current scene to an OpenSimulator archive. This archive will eventually include the prim's assets |
199 | /// as well as the details of the prims themselves. | 199 | /// as well as the details of the prims themselves. |
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
203 | { | 203 | { |
204 | CurrentOrFirstScene.SavePrimsToArchive(filename); | 204 | CurrentOrFirstScene.SavePrimsToArchive(filename); |
205 | } | 205 | } |
206 | 206 | ||
207 | /// <summary> | 207 | /// <summary> |
208 | /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload | 208 | /// Load an OpenSim archive into the current scene. This will load both the shapes of the prims and upload |
209 | /// their assets to the asset service. | 209 | /// their assets to the asset service. |