aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-09-04 15:12:36 -0700
committerDiva Canto2015-09-04 15:12:36 -0700
commitf9a7099abcc8bb2da81dc514adbe7803b14fcd6f (patch)
treead29c37adba37526a768696673e67126ab02ded8
parentDeleted OpenSim.Framework.Communications. Moved its two remaining files to Op... (diff)
downloadopensim-SC_OLD-f9a7099abcc8bb2da81dc514adbe7803b14fcd6f.zip
opensim-SC_OLD-f9a7099abcc8bb2da81dc514adbe7803b14fcd6f.tar.gz
opensim-SC_OLD-f9a7099abcc8bb2da81dc514adbe7803b14fcd6f.tar.bz2
opensim-SC_OLD-f9a7099abcc8bb2da81dc514adbe7803b14fcd6f.tar.xz
Moved RegionCombinerModule to OptionalModules. Removed it as its own top-level project/dll.
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerClientEventForwarder.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionCombinerClientEventForwarder.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerLargeLandChannel.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerPermissionModule.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionConnections.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionConnections.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCourseLocation.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/RegionCombinerModule/RegionData.cs (renamed from OpenSim/Region/RegionCombinerModule/RegionData.cs)0
-rw-r--r--OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs36
-rw-r--r--prebuild.xml36
10 files changed, 0 insertions, 72 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerClientEventForwarder.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerClientEventForwarder.cs
index 721d396..721d396 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerClientEventForwarder.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerClientEventForwarder.cs
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
index 83732e2..83732e2 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index 4bf2a82..4bf2a82 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs
index 98b0ae1..98b0ae1 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerModule.cs
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerPermissionModule.cs
index 07dd68b..07dd68b 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCombinerPermissionModule.cs
diff --git a/OpenSim/Region/RegionCombinerModule/RegionConnections.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionConnections.cs
index 62a3a91..62a3a91 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionConnections.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionConnections.cs
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCourseLocation.cs
index 224ac99..224ac99 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCourseLocation.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionCourseLocation.cs
diff --git a/OpenSim/Region/RegionCombinerModule/RegionData.cs b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionData.cs
index 42fca9f..42fca9f 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionData.cs
+++ b/OpenSim/Region/OptionalModules/RegionCombinerModule/RegionData.cs
diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
deleted file mode 100644
index 11b89d2..0000000
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4using Mono.Addins;
5
6// General Information about an assembly is controlled through the following
7// set of attributes. Change these attribute values to modify the information
8// associated with an assembly.
9[assembly: AssemblyTitle("OpenSim.Region.RegionCombinerModule")]
10[assembly: AssemblyDescription("")]
11[assembly: AssemblyConfiguration("")]
12[assembly: AssemblyCompany("http://opensimulator.org")]
13[assembly: AssemblyProduct("OpenSim")]
14[assembly: AssemblyCopyright("OpenSimulator developers")]
15[assembly: AssemblyTrademark("")]
16[assembly: AssemblyCulture("")]
17
18// Setting ComVisible to false makes the types in this assembly not visible
19// to COM components. If you need to access a type in this assembly from
20// COM, set the ComVisible attribute to true on that type.
21[assembly: ComVisible(false)]
22
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")]
25
26// Version information for an assembly consists of the following four values:
27//
28// Major Version
29// Minor Version
30// Build Number
31// Revision
32//
33[assembly: AssemblyVersion("0.8.2.*")]
34
35[assembly: Addin("OpenSim.RegionModules.RegionCombinerModule", OpenSim.VersionInfo.VersionNumber)]
36[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
diff --git a/prebuild.xml b/prebuild.xml
index e714abd..d46d178 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1485,42 +1485,6 @@
1485 </Files> 1485 </Files>
1486 </Project> 1486 </Project>
1487 1487
1488 <Project frameworkVersion="v4_0" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1489 <Configuration name="Debug">
1490 <Options>
1491 <OutputPath>../../../bin/</OutputPath>
1492 </Options>
1493 </Configuration>
1494 <Configuration name="Release">
1495 <Options>
1496 <OutputPath>../../../bin/</OutputPath>
1497 </Options>
1498 </Configuration>
1499
1500 <ReferencePath>../../../bin/</ReferencePath>
1501 <Reference name="System"/>
1502 <Reference name="System.Xml"/>
1503 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1504 <Reference name="OpenMetaverse" path="../../../bin/"/>
1505 <Reference name="OpenSim.Framework"/>
1506 <Reference name="OpenSim.Region.Framework"/>
1507 <Reference name="OpenSim.Server.Base"/>
1508 <Reference name="OpenSim.Server.Handlers"/>
1509 <Reference name="OpenSim.Framework.Console"/>
1510 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
1511 <Reference name="OpenSim.Region.CoreModules"/>
1512 <Reference name="Nini" path="../../../bin/"/>
1513 <Reference name="log4net" path="../../../bin/"/>
1514
1515 <!-- To allow regions to have mono addins -->
1516 <Reference name="Mono.Addins" path="../../../bin/"/>
1517
1518 <Files>
1519 <Match pattern="*.cs" recurse="true"/>
1520 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1521 </Files>
1522 </Project>
1523
1524 <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> 1488 <Project frameworkVersion="v4_0" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
1525 <Configuration name="Debug"> 1489 <Configuration name="Debug">
1526 <Options> 1490 <Options>