From a32187f53a1e72c2bc6c503085c35211e922a4f7 Mon Sep 17 00:00:00 2001
From: Diva Canto <diva@metaverseink.com>
Date: Fri, 4 Sep 2015 15:28:51 -0700
Subject: [PATCH] Moved UserStatistics feature to OptionalModules too.

---
 .../UserStatistics/ActiveConnectionsAJAX.cs   |  0
 .../UserStatistics/Clients_report.cs          |  0
 .../UserStatistics/Default_Report.cs          |  0
 .../UserStatistics/HTMLUtil.cs                |  0
 .../UserStatistics/IStatsReport.cs            |  0
 .../UserStatistics/LogLinesAJAX.cs            |  0
 .../UserStatistics/Prototype_distributor.cs   |  0
 .../UserStatistics/Sessions_Report.cs         |  0
 .../UserStatistics/SimStatsAJAX.cs            |  0
 .../UserStatistics/Updater_distributor.cs     |  0
 .../UserStatistics/WebStatsModule.cs          |  3 --
 .../UserStatistics/Properties/AssemblyInfo.cs | 33 ------------
 prebuild.xml                                  | 50 +------------------
 13 files changed, 2 insertions(+), 84 deletions(-)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/ActiveConnectionsAJAX.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/Clients_report.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/Default_Report.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/HTMLUtil.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/IStatsReport.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/LogLinesAJAX.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/Prototype_distributor.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/Sessions_Report.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/SimStatsAJAX.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/Updater_distributor.cs (100%)
 rename OpenSim/Region/{ => OptionalModules}/UserStatistics/WebStatsModule.cs (99%)
 delete mode 100644 OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs

diff --git a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs
diff --git a/OpenSim/Region/UserStatistics/Clients_report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/Clients_report.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
diff --git a/OpenSim/Region/UserStatistics/Default_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/Default_Report.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
diff --git a/OpenSim/Region/UserStatistics/HTMLUtil.cs b/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/HTMLUtil.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs
diff --git a/OpenSim/Region/UserStatistics/IStatsReport.cs b/OpenSim/Region/OptionalModules/UserStatistics/IStatsReport.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/IStatsReport.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/IStatsReport.cs
diff --git a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/LogLinesAJAX.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
diff --git a/OpenSim/Region/UserStatistics/Prototype_distributor.cs b/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/Prototype_distributor.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs
diff --git a/OpenSim/Region/UserStatistics/Sessions_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/Sessions_Report.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/SimStatsAJAX.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
diff --git a/OpenSim/Region/UserStatistics/Updater_distributor.cs b/OpenSim/Region/OptionalModules/UserStatistics/Updater_distributor.cs
similarity index 100%
rename from OpenSim/Region/UserStatistics/Updater_distributor.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/Updater_distributor.cs
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
similarity index 99%
rename from OpenSim/Region/UserStatistics/WebStatsModule.cs
rename to OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
index 13832084a9..bcb63617e3 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
@@ -50,9 +50,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 using OSD = OpenMetaverse.StructuredData.OSD;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
-[assembly: Addin("WebStats", OpenSim.VersionInfo.VersionNumber)]
-[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
-
 namespace OpenSim.Region.UserStatistics
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebStatsModule")]
diff --git a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs b/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9fac53e12c..0000000000
--- a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 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.UserStatistics")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim")]
-[assembly: AssemblyCopyright("OpenSimulator developers")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("42b28288-5fdd-478f-8903-8dccbbb2d5f9")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.8.2.*")]
-
diff --git a/prebuild.xml b/prebuild.xml
index f47e237a47..0daf6a403f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1500,6 +1500,7 @@
       <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System"/>
       <Reference name="System.Core"/>
+      <Reference name="System.Data"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Web"/>
@@ -1508,6 +1509,7 @@
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
       <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Data"/>
@@ -2267,54 +2269,6 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Data"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Drawing"/>
-      <Reference name="System.Runtime.Remoting"/>
-      <Reference name="System.Web"/>
-      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
-      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
-      <Reference name="OpenMetaverse" path="../../../bin/"/>
-      <Reference name="OpenSim.Capabilities"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Region.CoreModules"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Monitoring"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
-      <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
-      <Reference name="Mono.Addins" path="../../../bin/"/>
-
-      <!-- For scripting in funny languages by default -->
-      <Reference name="XMLRPC" path="../../../bin/"/>
-      <Reference name="Nini" path="../../../bin/"/>
-      <Reference name="log4net" path="../../../bin/"/>
-      <Reference name="DotNetOpenMail" path="../../../bin/"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true">
-          <Exclude name="Tests" pattern="Tests"/>
-        </Match>
-      </Files>
-    </Project>
-    
     <!-- Addons -->
     
     <Project frameworkVersion="v4_0" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">