aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
diff options
context:
space:
mode:
authorMelanie2010-08-07 05:41:41 +0100
committerMelanie2010-08-07 05:41:41 +0100
commit8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7 (patch)
treea9058df2a8b7b49944a01f718946e0d076758c15 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
parentCorrect display of landmark about info. Also correct region maturity rating (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.zip
opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.gz
opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.bz2
opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 4baa22c..d4f9f18 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -32,7 +32,6 @@ using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications; 34using OpenSim.Framework.Communications;
35
36using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common; 36using OpenSim.Tests.Common;
38using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;