aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-09-04 15:28:51 -0700
committerDiva Canto2015-09-04 15:28:51 -0700
commita32187f53a1e72c2bc6c503085c35211e922a4f7 (patch)
treee6c4073b4cadd08894ed5d7f2cf37252f6f0f978
parentMoved DataSnapshot feature to OptionalModules too. (diff)
downloadopensim-SC_OLD-a32187f53a1e72c2bc6c503085c35211e922a4f7.zip
opensim-SC_OLD-a32187f53a1e72c2bc6c503085c35211e922a4f7.tar.gz
opensim-SC_OLD-a32187f53a1e72c2bc6c503085c35211e922a4f7.tar.bz2
opensim-SC_OLD-a32187f53a1e72c2bc6c503085c35211e922a4f7.tar.xz
Moved UserStatistics feature to OptionalModules too.
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs (renamed from OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs (renamed from OpenSim/Region/UserStatistics/Clients_report.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs (renamed from OpenSim/Region/UserStatistics/Default_Report.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs (renamed from OpenSim/Region/UserStatistics/HTMLUtil.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/IStatsReport.cs (renamed from OpenSim/Region/UserStatistics/IStatsReport.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs (renamed from OpenSim/Region/UserStatistics/LogLinesAJAX.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs (renamed from OpenSim/Region/UserStatistics/Prototype_distributor.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs (renamed from OpenSim/Region/UserStatistics/Sessions_Report.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs (renamed from OpenSim/Region/UserStatistics/SimStatsAJAX.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/Updater_distributor.cs (renamed from OpenSim/Region/UserStatistics/Updater_distributor.cs)0
-rw-r--r--OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs (renamed from OpenSim/Region/UserStatistics/WebStatsModule.cs)3
-rw-r--r--OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs33
-rw-r--r--prebuild.xml50
13 files changed, 2 insertions, 84 deletions
diff --git a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs
index 6a1112c..6a1112c 100644
--- a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/ActiveConnectionsAJAX.cs
diff --git a/OpenSim/Region/UserStatistics/Clients_report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
index 4a6f7be..4a6f7be 100644
--- a/OpenSim/Region/UserStatistics/Clients_report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Clients_report.cs
diff --git a/OpenSim/Region/UserStatistics/Default_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
index fabe3d4..fabe3d4 100644
--- a/OpenSim/Region/UserStatistics/Default_Report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Default_Report.cs
diff --git a/OpenSim/Region/UserStatistics/HTMLUtil.cs b/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs
index c07619f..c07619f 100644
--- a/OpenSim/Region/UserStatistics/HTMLUtil.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/HTMLUtil.cs
diff --git a/OpenSim/Region/UserStatistics/IStatsReport.cs b/OpenSim/Region/OptionalModules/UserStatistics/IStatsReport.cs
index 80c4487..80c4487 100644
--- a/OpenSim/Region/UserStatistics/IStatsReport.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/IStatsReport.cs
diff --git a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
index 4d45b80..4d45b80 100644
--- a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/LogLinesAJAX.cs
diff --git a/OpenSim/Region/UserStatistics/Prototype_distributor.cs b/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs
index 6f8b2aa..6f8b2aa 100644
--- a/OpenSim/Region/UserStatistics/Prototype_distributor.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Prototype_distributor.cs
diff --git a/OpenSim/Region/UserStatistics/Sessions_Report.cs b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
index 0e94912..0e94912 100644
--- a/OpenSim/Region/UserStatistics/Sessions_Report.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Sessions_Report.cs
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
index 06d9e91..06d9e91 100644
--- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/SimStatsAJAX.cs
diff --git a/OpenSim/Region/UserStatistics/Updater_distributor.cs b/OpenSim/Region/OptionalModules/UserStatistics/Updater_distributor.cs
index 601e06b..601e06b 100644
--- a/OpenSim/Region/UserStatistics/Updater_distributor.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/Updater_distributor.cs
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
index 1383208..bcb6361 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
@@ -50,9 +50,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
50using OSD = OpenMetaverse.StructuredData.OSD; 50using OSD = OpenMetaverse.StructuredData.OSD;
51using OSDMap = OpenMetaverse.StructuredData.OSDMap; 51using OSDMap = OpenMetaverse.StructuredData.OSDMap;
52 52
53[assembly: Addin("WebStats", OpenSim.VersionInfo.VersionNumber)]
54[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
55
56namespace OpenSim.Region.UserStatistics 53namespace OpenSim.Region.UserStatistics
57{ 54{
58 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WebStatsModule")] 55 [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 9fac53e..0000000
--- a/OpenSim/Region/UserStatistics/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Region.UserStatistics")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("http://opensimulator.org")]
12[assembly: AssemblyProduct("OpenSim")]
13[assembly: AssemblyCopyright("OpenSimulator developers")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("42b28288-5fdd-478f-8903-8dccbbb2d5f9")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32[assembly: AssemblyVersion("0.8.2.*")]
33
diff --git a/prebuild.xml b/prebuild.xml
index f47e237..0daf6a4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1500,6 +1500,7 @@
1500 <ReferencePath>../../../bin/</ReferencePath> 1500 <ReferencePath>../../../bin/</ReferencePath>
1501 <Reference name="System"/> 1501 <Reference name="System"/>
1502 <Reference name="System.Core"/> 1502 <Reference name="System.Core"/>
1503 <Reference name="System.Data"/>
1503 <Reference name="System.Xml"/> 1504 <Reference name="System.Xml"/>
1504 <Reference name="System.Drawing"/> 1505 <Reference name="System.Drawing"/>
1505 <Reference name="System.Web"/> 1506 <Reference name="System.Web"/>
@@ -1508,6 +1509,7 @@
1508 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1509 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1509 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 1510 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1510 <Reference name="OpenMetaverse" path="../../../bin/"/> 1511 <Reference name="OpenMetaverse" path="../../../bin/"/>
1512 <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
1511 <Reference name="OpenSim.Capabilities"/> 1513 <Reference name="OpenSim.Capabilities"/>
1512 <Reference name="OpenSim.Framework"/> 1514 <Reference name="OpenSim.Framework"/>
1513 <Reference name="OpenSim.Data"/> 1515 <Reference name="OpenSim.Data"/>
@@ -2267,54 +2269,6 @@
2267 </Files> 2269 </Files>
2268 </Project> 2270 </Project>
2269 2271
2270 <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library">
2271 <Configuration name="Debug">
2272 <Options>
2273 <OutputPath>../../../bin/</OutputPath>
2274 </Options>
2275 </Configuration>
2276 <Configuration name="Release">
2277 <Options>
2278 <OutputPath>../../../bin/</OutputPath>
2279 </Options>
2280 </Configuration>
2281
2282 <ReferencePath>../../../bin/</ReferencePath>
2283 <Reference name="System"/>
2284 <Reference name="System.Data"/>
2285 <Reference name="System.Xml"/>
2286 <Reference name="System.Drawing"/>
2287 <Reference name="System.Runtime.Remoting"/>
2288 <Reference name="System.Web"/>
2289 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2290 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
2291 <Reference name="OpenMetaverse" path="../../../bin/"/>
2292 <Reference name="OpenSim.Capabilities"/>
2293 <Reference name="OpenSim.Framework"/>
2294 <Reference name="OpenSim.Data"/>
2295 <Reference name="OpenSim.Region.Framework"/>
2296 <Reference name="OpenSim.Region.CoreModules"/>
2297 <Reference name="OpenSim.Framework.Console"/>
2298 <Reference name="OpenSim.Framework.Monitoring"/>
2299 <Reference name="OpenSim.Framework.Servers"/>
2300 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2301 <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/>
2302 <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
2303 <Reference name="Mono.Addins" path="../../../bin/"/>
2304
2305 <!-- For scripting in funny languages by default -->
2306 <Reference name="XMLRPC" path="../../../bin/"/>
2307 <Reference name="Nini" path="../../../bin/"/>
2308 <Reference name="log4net" path="../../../bin/"/>
2309 <Reference name="DotNetOpenMail" path="../../../bin/"/>
2310
2311 <Files>
2312 <Match pattern="*.cs" recurse="true">
2313 <Exclude name="Tests" pattern="Tests"/>
2314 </Match>
2315 </Files>
2316 </Project>
2317
2318 <!-- Addons --> 2272 <!-- Addons -->
2319 2273
2320 <Project frameworkVersion="v4_0" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library"> 2274 <Project frameworkVersion="v4_0" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">