diff options
| author | Robert Adams | 2015-09-08 04:54:16 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 04:54:16 -0700 |
| commit | e5367d822be9b05e74c859afe2d2956a3e95aa33 (patch) | |
| tree | e904050a30715df587aa527d7f313755177726a7 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups | |
| parent | add lost admin_reset_land method (diff) | |
| parent | Deleted access control spec from [LoginService] section of standalone config.... (diff) | |
| download | opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.zip opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.gz opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.bz2 opensim-SC-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.xz | |
Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups')
4 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index ed1bab4..eef3c92 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
| @@ -35,7 +35,6 @@ using Nini.Config; | |||
| 35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
| 36 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
| 37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
| 38 | using OpenSim.Framework.Communications; | ||
| 39 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
| 40 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
| 41 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 8095b28..1cb4747 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |||
| @@ -42,7 +42,6 @@ using OpenMetaverse; | |||
| 42 | using OpenMetaverse.StructuredData; | 42 | using OpenMetaverse.StructuredData; |
| 43 | 43 | ||
| 44 | using OpenSim.Framework; | 44 | using OpenSim.Framework; |
| 45 | using OpenSim.Framework.Communications; | ||
| 46 | using OpenSim.Region.Framework.Interfaces; | 45 | using OpenSim.Region.Framework.Interfaces; |
| 47 | using OpenSim.Services.Interfaces; | 46 | using OpenSim.Services.Interfaces; |
| 48 | 47 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs index e03e71d..9a42bac 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | |||
| @@ -37,7 +37,6 @@ using OpenMetaverse.Messages.Linden; | |||
| 37 | using OpenMetaverse.Packets; | 37 | using OpenMetaverse.Packets; |
| 38 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
| 39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
| 40 | using OpenSim.Framework.Communications; | ||
| 41 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
| 42 | using OpenSim.Framework.Servers.HttpServer; | 41 | using OpenSim.Framework.Servers.HttpServer; |
| 43 | using OpenSim.Region.ClientStack.Linden; | 42 | using OpenSim.Region.ClientStack.Linden; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index a040f43..20555e4 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
| @@ -41,7 +41,6 @@ using OpenMetaverse; | |||
| 41 | using OpenMetaverse.StructuredData; | 41 | using OpenMetaverse.StructuredData; |
| 42 | 42 | ||
| 43 | using OpenSim.Framework; | 43 | using OpenSim.Framework; |
| 44 | using OpenSim.Framework.Communications; | ||
| 45 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
| 46 | using OpenSim.Services.Interfaces; | 45 | using OpenSim.Services.Interfaces; |
| 47 | 46 | ||