diff options
author | Melanie | 2013-11-23 19:13:22 +0000 |
---|---|---|
committer | Melanie | 2013-11-23 19:13:22 +0000 |
commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Region/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
download | opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to 'OpenSim/Region/Framework')
3 files changed, 74 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f5cb84b..5851ec6 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -511,7 +511,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
511 | { | 511 | { |
512 | get | 512 | get |
513 | { | 513 | { |
514 | if (CreatorData != null && CreatorData != string.Empty) | 514 | if (!string.IsNullOrEmpty(CreatorData)) |
515 | return CreatorID.ToString() + ';' + CreatorData; | 515 | return CreatorID.ToString() + ';' + CreatorData; |
516 | else | 516 | else |
517 | return CreatorID.ToString(); | 517 | return CreatorID.ToString(); |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index bc51b32..5372360 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -1279,7 +1279,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1279 | 1279 | ||
1280 | WriteUUID(writer, "CreatorID", sop.CreatorID, options); | 1280 | WriteUUID(writer, "CreatorID", sop.CreatorID, options); |
1281 | 1281 | ||
1282 | if (sop.CreatorData != null && sop.CreatorData != string.Empty) | 1282 | if (!string.IsNullOrEmpty(sop.CreatorData)) |
1283 | writer.WriteElementString("CreatorData", sop.CreatorData); | 1283 | writer.WriteElementString("CreatorData", sop.CreatorData); |
1284 | else if (options.ContainsKey("home")) | 1284 | else if (options.ContainsKey("home")) |
1285 | { | 1285 | { |
@@ -1464,7 +1464,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1464 | 1464 | ||
1465 | WriteUUID(writer, "CreatorID", item.CreatorID, options); | 1465 | WriteUUID(writer, "CreatorID", item.CreatorID, options); |
1466 | 1466 | ||
1467 | if (item.CreatorData != null && item.CreatorData != string.Empty) | 1467 | if (!string.IsNullOrEmpty(item.CreatorData)) |
1468 | writer.WriteElementString("CreatorData", item.CreatorData); | 1468 | writer.WriteElementString("CreatorData", item.CreatorData); |
1469 | else if (options.ContainsKey("home")) | 1469 | else if (options.ContainsKey("home")) |
1470 | { | 1470 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs new file mode 100644 index 0000000..1667002 --- /dev/null +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneStatisticsTests.cs | |||
@@ -0,0 +1,71 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using NUnit.Framework; | ||
32 | using OpenMetaverse; | ||
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Communications; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenSim.Tests.Common; | ||
37 | using OpenSim.Tests.Common.Mock; | ||
38 | |||
39 | namespace OpenSim.Region.Framework.Scenes.Tests | ||
40 | { | ||
41 | [TestFixture] | ||
42 | public class SceneStatisticsTests : OpenSimTestCase | ||
43 | { | ||
44 | private TestScene m_scene; | ||
45 | |||
46 | [SetUp] | ||
47 | public void Init() | ||
48 | { | ||
49 | m_scene = new SceneHelpers().SetupScene(); | ||
50 | } | ||
51 | |||
52 | [Test] | ||
53 | public void TestAddRemovePhysicalLinkset() | ||
54 | { | ||
55 | Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0)); | ||
56 | |||
57 | UUID ownerId = TestHelpers.ParseTail(0x1); | ||
58 | SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(3, ownerId, "so1", 0x10); | ||
59 | so1.ScriptSetPhysicsStatus(true); | ||
60 | m_scene.AddSceneObject(so1); | ||
61 | |||
62 | Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(3)); | ||
63 | Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(3)); | ||
64 | |||
65 | m_scene.DeleteSceneObject(so1, false); | ||
66 | |||
67 | Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(0)); | ||
68 | Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0)); | ||
69 | } | ||
70 | } | ||
71 | } \ No newline at end of file | ||