diff options
Diffstat (limited to '')
4 files changed, 18 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 117b2fd..d5d4468 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
56 | /// The maximum major version of OAR that we can read. Minor versions shouldn't need a max number since version | 56 | /// The maximum major version of OAR that we can read. Minor versions shouldn't need a max number since version |
57 | /// bumps here should be compatible. | 57 | /// bumps here should be compatible. |
58 | /// </summary> | 58 | /// </summary> |
59 | public static int MAX_MAJOR_VERSION = 0; | 59 | public static int MAX_MAJOR_VERSION = 1; |
60 | 60 | ||
61 | protected Scene m_scene; | 61 | protected Scene m_scene; |
62 | protected Stream m_loadStream; | 62 | protected Stream m_loadStream; |
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 3eb797b..b987b5a 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -192,9 +192,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
192 | new AssetsArchiver(archiveWriter), assetUuids, | 192 | new AssetsArchiver(archiveWriter), assetUuids, |
193 | m_scene.AssetService, awre.ReceivedAllAssets).Execute(); | 193 | m_scene.AssetService, awre.ReceivedAllAssets).Execute(); |
194 | } | 194 | } |
195 | finally | 195 | catch (Exception) |
196 | { | 196 | { |
197 | m_saveStream.Close(); | 197 | m_saveStream.Close(); |
198 | throw; | ||
198 | } | 199 | } |
199 | } | 200 | } |
200 | 201 | ||
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index ade0e11..04b6e3d 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -122,13 +122,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
122 | } | 122 | } |
123 | 123 | ||
124 | /// <summary> | 124 | /// <summary> |
125 | /// Test saving a V0.2 OpenSim Region Archive. | 125 | /// Test saving an OpenSim Region Archive. |
126 | /// </summary> | 126 | /// </summary> |
127 | [Test] | 127 | [Test] |
128 | public void TestSaveOarV0_2() | 128 | public void TestSaveOar() |
129 | { | 129 | { |
130 | TestHelper.InMethod(); | 130 | TestHelper.InMethod(); |
131 | //log4net.Config.XmlConfigurator.Configure(); | 131 | // log4net.Config.XmlConfigurator.Configure(); |
132 | 132 | ||
133 | SceneObjectPart part1 = CreateSceneObjectPart1(); | 133 | SceneObjectPart part1 = CreateSceneObjectPart1(); |
134 | SceneObjectGroup sog1 = new SceneObjectGroup(part1); | 134 | SceneObjectGroup sog1 = new SceneObjectGroup(part1); |
@@ -212,10 +212,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
212 | } | 212 | } |
213 | 213 | ||
214 | /// <summary> | 214 | /// <summary> |
215 | /// Test loading a V0.2 OpenSim Region Archive. | 215 | /// Test loading an OpenSim Region Archive. |
216 | /// </summary> | 216 | /// </summary> |
217 | [Test] | 217 | [Test] |
218 | public void TestLoadOarV0_2() | 218 | public void TestLoadOar() |
219 | { | 219 | { |
220 | TestHelper.InMethod(); | 220 | TestHelper.InMethod(); |
221 | // log4net.Config.XmlConfigurator.Configure(); | 221 | // log4net.Config.XmlConfigurator.Configure(); |
@@ -317,10 +317,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
317 | } | 317 | } |
318 | 318 | ||
319 | /// <summary> | 319 | /// <summary> |
320 | /// Test loading the region settings of a V0.2 OpenSim Region Archive. | 320 | /// Test loading the region settings of an OpenSim Region Archive. |
321 | /// </summary> | 321 | /// </summary> |
322 | [Test] | 322 | [Test] |
323 | public void TestLoadOarV0_2RegionSettings() | 323 | public void TestLoadOarRegionSettings() |
324 | { | 324 | { |
325 | TestHelper.InMethod(); | 325 | TestHelper.InMethod(); |
326 | //log4net.Config.XmlConfigurator.Configure(); | 326 | //log4net.Config.XmlConfigurator.Configure(); |
@@ -409,10 +409,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
409 | } | 409 | } |
410 | 410 | ||
411 | /// <summary> | 411 | /// <summary> |
412 | /// Test merging a V0.2 OpenSim Region Archive into an existing scene | 412 | /// Test merging an OpenSim Region Archive into an existing scene |
413 | /// </summary> | 413 | /// </summary> |
414 | //[Test] | 414 | //[Test] |
415 | public void TestMergeOarV0_2() | 415 | public void TestMergeOar() |
416 | { | 416 | { |
417 | TestHelper.InMethod(); | 417 | TestHelper.InMethod(); |
418 | //XmlConfigurator.Configure(); | 418 | //XmlConfigurator.Configure(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cc3cf17..d06b134 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -8750,24 +8750,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8750 | 8750 | ||
8751 | switch (data) | 8751 | switch (data) |
8752 | { | 8752 | { |
8753 | case 5: // DATA_SIM_POS | 8753 | case ScriptBaseClass.DATA_SIM_POS: |
8754 | if (info == null) | 8754 | if (info == null) |
8755 | { | 8755 | { |
8756 | ScriptSleep(1000); | 8756 | ScriptSleep(1000); |
8757 | return UUID.Zero.ToString(); | 8757 | return UUID.Zero.ToString(); |
8758 | } | 8758 | } |
8759 | reply = new LSL_Vector( | 8759 | reply = new LSL_Vector( |
8760 | info.RegionLocX * Constants.RegionSize, | 8760 | info.RegionLocX, |
8761 | info.RegionLocY * Constants.RegionSize, | 8761 | info.RegionLocY, |
8762 | 0).ToString(); | 8762 | 0).ToString(); |
8763 | break; | 8763 | break; |
8764 | case 6: // DATA_SIM_STATUS | 8764 | case ScriptBaseClass.DATA_SIM_STATUS: |
8765 | if (info != null) | 8765 | if (info != null) |
8766 | reply = "up"; // Duh! | 8766 | reply = "up"; // Duh! |
8767 | else | 8767 | else |
8768 | reply = "unknown"; | 8768 | reply = "unknown"; |
8769 | break; | 8769 | break; |
8770 | case 7: // DATA_SIM_RATING | 8770 | case ScriptBaseClass.DATA_SIM_RATING: |
8771 | if (info == null) | 8771 | if (info == null) |
8772 | { | 8772 | { |
8773 | ScriptSleep(1000); | 8773 | ScriptSleep(1000); |
@@ -8783,7 +8783,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8783 | else | 8783 | else |
8784 | reply = "UNKNOWN"; | 8784 | reply = "UNKNOWN"; |
8785 | break; | 8785 | break; |
8786 | case 128: | 8786 | case ScriptBaseClass.DATA_SIM_RELEASE: |
8787 | if (ossl != null) | 8787 | if (ossl != null) |
8788 | ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); | 8788 | ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); |
8789 | reply = "OpenSim"; | 8789 | reply = "OpenSim"; |