OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-19 19:10:12 -08:00
parent c4dd724cba f1151f20dc
commit d04cbd8f85
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// The maximum major version of OAR that we can read. Minor versions shouldn't need a max number since version /// The maximum major version of OAR that we can read. Minor versions shouldn't need a max number since version
/// bumps here should be compatible. /// bumps here should be compatible.
/// </summary> /// </summary>
public static int MAX_MAJOR_VERSION = 0; public static int MAX_MAJOR_VERSION = 1;
protected Scene m_scene; protected Scene m_scene;
protected Stream m_loadStream; protected Stream m_loadStream;

3
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@ -192,9 +192,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
new AssetsArchiver(archiveWriter), assetUuids, new AssetsArchiver(archiveWriter), assetUuids,
m_scene.AssetService, awre.ReceivedAllAssets).Execute(); m_scene.AssetService, awre.ReceivedAllAssets).Execute();
} }
finally catch (Exception)
{ {
m_saveStream.Close(); m_saveStream.Close();
throw;
} }
} }

18
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -122,13 +122,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
} }
/// <summary> /// <summary>
/// Test saving a V0.2 OpenSim Region Archive. /// Test saving an OpenSim Region Archive.
/// </summary> /// </summary>
[Test] [Test]
public void TestSaveOarV0_2() public void TestSaveOar()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
SceneObjectPart part1 = CreateSceneObjectPart1(); SceneObjectPart part1 = CreateSceneObjectPart1();
SceneObjectGroup sog1 = new SceneObjectGroup(part1); SceneObjectGroup sog1 = new SceneObjectGroup(part1);
@ -212,10 +212,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
} }
/// <summary> /// <summary>
/// Test loading a V0.2 OpenSim Region Archive. /// Test loading an OpenSim Region Archive.
/// </summary> /// </summary>
[Test] [Test]
public void TestLoadOarV0_2() public void TestLoadOar()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
@ -317,10 +317,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
} }
/// <summary> /// <summary>
/// Test loading the region settings of a V0.2 OpenSim Region Archive. /// Test loading the region settings of an OpenSim Region Archive.
/// </summary> /// </summary>
[Test] [Test]
public void TestLoadOarV0_2RegionSettings() public void TestLoadOarRegionSettings()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
@ -409,10 +409,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
} }
/// <summary> /// <summary>
/// Test merging a V0.2 OpenSim Region Archive into an existing scene /// Test merging an OpenSim Region Archive into an existing scene
/// </summary> /// </summary>
//[Test] //[Test]
public void TestMergeOarV0_2() public void TestMergeOar()
{ {
TestHelper.InMethod(); TestHelper.InMethod();
//XmlConfigurator.Configure(); //XmlConfigurator.Configure();

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -8750,24 +8750,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
switch (data) switch (data)
{ {
case 5: // DATA_SIM_POS case ScriptBaseClass.DATA_SIM_POS:
if (info == null) if (info == null)
{ {
ScriptSleep(1000); ScriptSleep(1000);
return UUID.Zero.ToString(); return UUID.Zero.ToString();
} }
reply = new LSL_Vector( reply = new LSL_Vector(
info.RegionLocX * Constants.RegionSize, info.RegionLocX,
info.RegionLocY * Constants.RegionSize, info.RegionLocY,
0).ToString(); 0).ToString();
break; break;
case 6: // DATA_SIM_STATUS case ScriptBaseClass.DATA_SIM_STATUS:
if (info != null) if (info != null)
reply = "up"; // Duh! reply = "up"; // Duh!
else else
reply = "unknown"; reply = "unknown";
break; break;
case 7: // DATA_SIM_RATING case ScriptBaseClass.DATA_SIM_RATING:
if (info == null) if (info == null)
{ {
ScriptSleep(1000); ScriptSleep(1000);
@ -8783,7 +8783,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else else
reply = "UNKNOWN"; reply = "UNKNOWN";
break; break;
case 128: case ScriptBaseClass.DATA_SIM_RELEASE:
if (ossl != null) if (ossl != null)
ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData");
reply = "OpenSim"; reply = "OpenSim";