aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar
diff options
context:
space:
mode:
authorMelanie2011-05-22 20:23:25 +0100
committerMelanie2011-05-22 20:23:25 +0100
commitbe1996f1210ba58ba44f9715de68a3675cf13582 (patch)
tree7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Region/OptionalModules/Avatar
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAdd stubs for unimplemented lsl functions (diff)
downloadopensim-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/Region/OptionalModules/Avatar')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index 6de97b7..ee52a39 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Communications;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Tests.Common; 36using OpenSim.Tests.Common;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup;
39 38
40namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests 39namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
41{ 40{