aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/Tests
diff options
context:
space:
mode:
authorMelanie2011-05-22 20:00:59 +0200
committerMelanie2011-05-22 20:00:59 +0200
commit89705b19c7a921f3a1432203694f76a3c3711775 (patch)
tree0da8e5adfbb408042a6658b8315c9337f8affd3a /OpenSim/Region/ScriptEngine/XEngine/Tests
parentAdd a missing virtual keyword (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-89705b19c7a921f3a1432203694f76a3c3711775.zip
opensim-SC_OLD-89705b19c7a921f3a1432203694f76a3c3711775.tar.gz
opensim-SC_OLD-89705b19c7a921f3a1432203694f76a3c3711775.tar.bz2
opensim-SC_OLD-89705b19c7a921f3a1432203694f76a3c3711775.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/Tests')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index 045abb4..b635d5c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -29,7 +29,6 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using Nini.Config; 30using Nini.Config;
31using NUnit.Framework; 31using NUnit.Framework;
32using OpenSim.Tests.Common.Setup;
33using OpenSim.Tests.Common.Mock; 32using OpenSim.Tests.Common.Mock;
34using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 34using OpenMetaverse;