aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Tests
diff options
context:
space:
mode:
authorMelanie2011-05-22 20:23:25 +0100
committerMelanie2011-05-22 20:23:25 +0100
commitbe1996f1210ba58ba44f9715de68a3675cf13582 (patch)
tree7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Framework/Tests
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAdd stubs for unimplemented lsl functions (diff)
downloadopensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.zip
opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.gz
opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.bz2
opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Tests')
-rw-r--r--OpenSim/Framework/Tests/AnimationTests.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs
index 9aa95af..aa4c6aa 100644
--- a/OpenSim/Framework/Tests/AnimationTests.cs
+++ b/OpenSim/Framework/Tests/AnimationTests.cs
@@ -33,7 +33,6 @@ using OpenMetaverse.StructuredData;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Tests.Common; 34using OpenSim.Tests.Common;
35using OpenSim.Tests.Common.Mock; 35using OpenSim.Tests.Common.Mock;
36using OpenSim.Tests.Common.Setup;
37using Animation = OpenSim.Framework.Animation; 36using Animation = OpenSim.Framework.Animation;
38 37
39namespace OpenSim.Framework.Tests 38namespace OpenSim.Framework.Tests