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
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/PhysicsModules/Meshing/Properties
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
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
index 11b89d2..d6ac8b2 100644
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using Mono.Addins;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.Region.RegionCombinerModule")]
+[assembly: AssemblyTitle("OpenSim.Region.PhysicsModules.Meshing")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("http://opensimulator.org")]
@@ -21,7 +21,7 @@ using Mono.Addins;
 [assembly: ComVisible(false)]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("73c166d2-c9d8-4ab8-af4e-89c41b4b58a9")]
+[assembly: Guid("4b7e35c2-a9dd-4b10-b778-eb417f4f6884")]
 // Version information for an assembly consists of the following four values:
 //
@@ -32,5 +32,5 @@ using Mono.Addins;
 //
 [assembly: AssemblyVersion("0.8.2.*")]
-[assembly: Addin("OpenSim.RegionModules.RegionCombinerModule", OpenSim.VersionInfo.VersionNumber)]
+[assembly: Addin("OpenSim.Region.PhysicsModules.Meshing", OpenSim.VersionInfo.VersionNumber)]
 [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
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/PhysicsModules/Meshing/Properties
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

diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs index 11b89d2..d6ac8b2 100644 --- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using Mono.Addins;
6	// General Information about an assembly is controlled through the following	6	// General Information about an assembly is controlled through the following
7	// set of attributes. Change these attribute values to modify the information	7	// set of attributes. Change these attribute values to modify the information
8	// associated with an assembly.	8	// associated with an assembly.
9	[assembly: AssemblyTitle("OpenSim.Region.RegionCombinerModule")]	9	[assembly: AssemblyTitle("OpenSim.Region.PhysicsModules.Meshing")]
10	[assembly: AssemblyDescription("")]	10	[assembly: AssemblyDescription("")]
11	[assembly: AssemblyConfiguration("")]	11	[assembly: AssemblyConfiguration("")]
12	[assembly: AssemblyCompany("http://opensimulator.org")]	12	[assembly: AssemblyCompany("http://opensimulator.org")]
@@ -21,7 +21,7 @@ using Mono.Addins;
21	[assembly: ComVisible(false)]	21	[assembly: ComVisible(false)]
22		22
23	// The following GUID is for the ID of the typelib if this project is exposed to COM	23	// The following GUID is for the ID of the typelib if this project is exposed to COM
24	[assembly: Guid("73c166d2-c9d8-4ab8-af4e-89c41b4b58a9")]	24	[assembly: Guid("4b7e35c2-a9dd-4b10-b778-eb417f4f6884")]
25		25
26	// Version information for an assembly consists of the following four values:	26	// Version information for an assembly consists of the following four values:
27	//	27	//
@@ -32,5 +32,5 @@ using Mono.Addins;
32	//	32	//
33	[assembly: AssemblyVersion("0.8.2.*")]	33	[assembly: AssemblyVersion("0.8.2.*")]
34		34
35	[assembly: Addin("OpenSim.RegionModules.RegionCombinerModule", OpenSim.VersionInfo.VersionNumber)]	35	[assembly: Addin("OpenSim.Region.PhysicsModules.Meshing", OpenSim.VersionInfo.VersionNumber)]
36	[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]	36	[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]