diff options
| author | Melanie | 2011-05-22 20:23:25 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-22 20:23:25 +0100 |
| commit | be1996f1210ba58ba44f9715de68a3675cf13582 (patch) | |
| tree | 7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Add stubs for unimplemented lsl functions (diff) | |
| download | opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.zip opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.gz opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.bz2 opensim-SC_OLD-be1996f1210ba58ba44f9715de68a3675cf13582.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Tests/AnimationTests.cs | 1 |
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; | |||
| 33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
| 34 | using OpenSim.Tests.Common; | 34 | using OpenSim.Tests.Common; |
| 35 | using OpenSim.Tests.Common.Mock; | 35 | using OpenSim.Tests.Common.Mock; |
| 36 | using OpenSim.Tests.Common.Setup; | ||
| 37 | using Animation = OpenSim.Framework.Animation; | 36 | using Animation = OpenSim.Framework.Animation; |
| 38 | 37 | ||
| 39 | namespace OpenSim.Framework.Tests | 38 | namespace OpenSim.Framework.Tests |