diff options
author | Justin Clark-Casey (justincc) | 2012-07-25 23:11:50 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-25 23:11:50 +0100 |
commit | 35efa88c26d249d315837fdca0faf643511e1a4e (patch) | |
tree | 00227cb097196ca172ed9639c536e4934326e89f | |
parent | Add MemoryWatchdog class missing from git master a1e9964 (diff) | |
download | opensim-SC_OLD-35efa88c26d249d315837fdca0faf643511e1a4e.zip opensim-SC_OLD-35efa88c26d249d315837fdca0faf643511e1a4e.tar.gz opensim-SC_OLD-35efa88c26d249d315837fdca0faf643511e1a4e.tar.bz2 opensim-SC_OLD-35efa88c26d249d315837fdca0faf643511e1a4e.tar.xz |
Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.
This better reflects the long-term purpose of that project and matches Monitoring modules.
Diffstat (limited to '')
27 files changed, 50 insertions, 53 deletions
diff --git a/OpenSim/Framework/Statistics/AssetStatsCollector.cs b/OpenSim/Framework/Monitoring/AssetStatsCollector.cs index 7082ef3..2a4d45b 100644 --- a/OpenSim/Framework/Statistics/AssetStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/AssetStatsCollector.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Timers; | 29 | using System.Timers; |
30 | 30 | ||
31 | namespace OpenSim.Framework.Statistics | 31 | namespace OpenSim.Framework.Monitoring |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Asset service statistics collection | 34 | /// Asset service statistics collection |
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs index 1fe086c..57a63ef 100644 --- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs | |||
@@ -31,8 +31,7 @@ using System.Text; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenMetaverse.StructuredData; | 32 | using OpenMetaverse.StructuredData; |
33 | 33 | ||
34 | 34 | namespace OpenSim.Framework.Monitoring | |
35 | namespace OpenSim.Framework.Statistics | ||
36 | { | 35 | { |
37 | /// <summary> | 36 | /// <summary> |
38 | /// Statistics which all collectors are interested in reporting | 37 | /// Statistics which all collectors are interested in reporting |
diff --git a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs b/OpenSim/Framework/Monitoring/Interfaces/IPullStatsProvider.cs index 430e580..86a6620 100644 --- a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs +++ b/OpenSim/Framework/Monitoring/Interfaces/IPullStatsProvider.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Framework.Statistics.Interfaces | 28 | namespace OpenSim.Framework.Monitoring.Interfaces |
29 | { | 29 | { |
30 | /// <summary> | 30 | /// <summary> |
31 | /// Implemented by objects which allow statistical information to be pulled from them. | 31 | /// Implemented by objects which allow statistical information to be pulled from them. |
diff --git a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs index 477bbb3..99f75e3 100644 --- a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Framework.Statistics | 28 | namespace OpenSim.Framework.Monitoring |
29 | { | 29 | { |
30 | /// <summary> | 30 | /// <summary> |
31 | /// Implemented by classes which collect up non-viewer statistical information | 31 | /// Implemented by classes which collect up non-viewer statistical information |
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs index a506e3b..cdd7cc7 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs | |||
@@ -28,12 +28,11 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Text; | 30 | using System.Text; |
31 | |||
32 | using OpenMetaverse; | 31 | using OpenMetaverse; |
33 | using OpenSim.Framework.Statistics.Interfaces; | ||
34 | using OpenMetaverse.StructuredData; | 32 | using OpenMetaverse.StructuredData; |
33 | using OpenSim.Framework.Monitoring.Interfaces; | ||
35 | 34 | ||
36 | namespace OpenSim.Framework.Statistics | 35 | namespace OpenSim.Framework.Monitoring |
37 | { | 36 | { |
38 | /// <summary> | 37 | /// <summary> |
39 | /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane | 38 | /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane |
diff --git a/OpenSim/Framework/Statistics/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs index 436ce2f..d78fa6a 100644 --- a/OpenSim/Framework/Statistics/StatsManager.cs +++ b/OpenSim/Framework/Monitoring/StatsManager.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Framework.Statistics | 28 | namespace OpenSim.Framework.Monitoring |
29 | { | 29 | { |
30 | /// <summary> | 30 | /// <summary> |
31 | /// Singleton used to provide access to statistics reporters | 31 | /// Singleton used to provide access to statistics reporters |
diff --git a/OpenSim/Framework/Statistics/UserStatsCollector.cs b/OpenSim/Framework/Monitoring/UserStatsCollector.cs index fd2a9bf..e89c8e6 100644 --- a/OpenSim/Framework/Statistics/UserStatsCollector.cs +++ b/OpenSim/Framework/Monitoring/UserStatsCollector.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Timers; | 28 | using System.Timers; |
29 | 29 | ||
30 | namespace OpenSim.Framework.Statistics | 30 | namespace OpenSim.Framework.Monitoring |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// Collects user service statistics | 33 | /// Collects user service statistics |
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 14d8b0c..ab8d95a 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -42,7 +42,7 @@ using OpenSim.Framework; | |||
42 | using OpenSim.Framework.Console; | 42 | using OpenSim.Framework.Console; |
43 | using OpenSim.Framework.Servers; | 43 | using OpenSim.Framework.Servers; |
44 | using OpenSim.Framework.Servers.HttpServer; | 44 | using OpenSim.Framework.Servers.HttpServer; |
45 | using OpenSim.Framework.Statistics; | 45 | using OpenSim.Framework.Monitoring; |
46 | using Timer=System.Timers.Timer; | 46 | using Timer=System.Timers.Timer; |
47 | 47 | ||
48 | using OpenMetaverse; | 48 | using OpenMetaverse; |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index f68974c..07a9756 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -40,7 +40,7 @@ using OpenMetaverse; | |||
40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Console; | 41 | using OpenSim.Framework.Console; |
42 | using OpenSim.Framework.Servers; | 42 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Framework.Statistics; | 43 | using OpenSim.Framework.Monitoring; |
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.Framework.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
46 | 46 | ||
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 825c4c4..4084741 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Framework.Communications; | |||
40 | using OpenSim.Framework.Console; | 40 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Servers; | 41 | using OpenSim.Framework.Servers; |
42 | using OpenSim.Framework.Servers.HttpServer; | 42 | using OpenSim.Framework.Servers.HttpServer; |
43 | using OpenSim.Framework.Statistics; | 43 | using OpenSim.Framework.Monitoring; |
44 | using OpenSim.Region.ClientStack; | 44 | using OpenSim.Region.ClientStack; |
45 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts; | 45 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts; |
46 | using OpenSim.Region.Framework; | 46 | using OpenSim.Region.Framework; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index f7864b8..01ceeed 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -41,7 +41,7 @@ using OpenMetaverse.Messages.Linden; | |||
41 | using OpenMetaverse.StructuredData; | 41 | using OpenMetaverse.StructuredData; |
42 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
43 | using OpenSim.Framework.Client; | 43 | using OpenSim.Framework.Client; |
44 | using OpenSim.Framework.Statistics; | 44 | using OpenSim.Framework.Monitoring; |
45 | using OpenSim.Region.Framework.Interfaces; | 45 | using OpenSim.Region.Framework.Interfaces; |
46 | using OpenSim.Region.Framework.Scenes; | 46 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.Services.Interfaces; | 47 | using OpenSim.Services.Interfaces; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 746eb90..55780d6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -37,7 +37,7 @@ using log4net; | |||
37 | using Nini.Config; | 37 | using Nini.Config; |
38 | using OpenMetaverse.Packets; | 38 | using OpenMetaverse.Packets; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Statistics; | 40 | using OpenSim.Framework.Monitoring; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenMetaverse; | 42 | using OpenMetaverse; |
43 | 43 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs index 4bcd2ac..764adf9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Commands/UserCommandsModule.cs | |||
@@ -37,7 +37,7 @@ using Nini.Config; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Statistics; | 40 | using OpenSim.Framework.Monitoring; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | 43 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 990dffb..11e0150 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -31,7 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Statistics; | 34 | using OpenSim.Framework.Monitoring; |
35 | using OpenSim.Services.Connectors; | 35 | using OpenSim.Services.Connectors; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index e5cd3e2..09f6758 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
@@ -37,7 +37,7 @@ using Nini.Config; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Statistics; | 40 | using OpenSim.Framework.Monitoring; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | 43 | ||
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs index 2838e0c..7d35473 100644 --- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs | |||
@@ -37,7 +37,7 @@ using Nini.Config; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Statistics; | 40 | using OpenSim.Framework.Monitoring; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | 43 | ||
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index 1365831..c11174d 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework.Communications; | |||
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Framework.Servers.HttpServer; | 41 | using OpenSim.Framework.Servers.HttpServer; |
42 | using OpenSim.Framework.Statistics; | 42 | using OpenSim.Framework.Monitoring; |
43 | using OpenSim.Region.Framework; | 43 | using OpenSim.Region.Framework; |
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.Framework.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 742d42a..96317c3 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Timers; | 30 | using System.Timers; |
31 | using OpenMetaverse.Packets; | 31 | using OpenMetaverse.Packets; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Statistics; | 33 | using OpenSim.Framework.Monitoring; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | 35 | ||
36 | namespace OpenSim.Region.Framework.Scenes | 36 | namespace OpenSim.Region.Framework.Scenes |
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs index ca9bd4a..5fe5948 100644 --- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | |||
@@ -35,7 +35,7 @@ using Nini.Config; | |||
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
38 | using OpenSim.Framework.Statistics; | 38 | using OpenSim.Framework.Monitoring; |
39 | using OpenSim.Region.ClientStack.LindenUDP; | 39 | using OpenSim.Region.ClientStack.LindenUDP; |
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs index 6bb6729..d718a2f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs | |||
@@ -36,7 +36,7 @@ using Nini.Config; | |||
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework.Console; |
39 | using OpenSim.Framework.Statistics; | 39 | using OpenSim.Framework.Monitoring; |
40 | using OpenSim.Region.ClientStack.LindenUDP; | 40 | using OpenSim.Region.ClientStack.LindenUDP; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs index 1b9e3ac..d68aabc 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/AttachmentsCommandModule.cs | |||
@@ -36,7 +36,7 @@ using Nini.Config; | |||
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework.Console; |
39 | using OpenSim.Framework.Statistics; | 39 | using OpenSim.Framework.Monitoring; |
40 | using OpenSim.Region.ClientStack.LindenUDP; | 40 | using OpenSim.Region.ClientStack.LindenUDP; |
41 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs index 2602050..4e84364 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | |||
@@ -37,7 +37,7 @@ using Nini.Config; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Console; | 39 | using OpenSim.Framework.Console; |
40 | using OpenSim.Framework.Statistics; | 40 | using OpenSim.Framework.Monitoring; |
41 | using OpenSim.Region.ClientStack.LindenUDP; | 41 | using OpenSim.Region.ClientStack.LindenUDP; |
42 | using OpenSim.Region.CoreModules.Avatar.Friends; | 42 | using OpenSim.Region.CoreModules.Avatar.Friends; |
43 | using OpenSim.Region.Framework.Interfaces; | 43 | using OpenSim.Region.Framework.Interfaces; |
diff --git a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs index dcbd717..3243a9a 100644 --- a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs +++ b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs | |||
@@ -34,7 +34,7 @@ using Mono.Data.SqliteClient; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Framework.Statistics; | 37 | using OpenSim.Framework.Monitoring; |
38 | 38 | ||
39 | namespace OpenSim.Region.UserStatistics | 39 | namespace OpenSim.Region.UserStatistics |
40 | { | 40 | { |
diff --git a/OpenSim/Region/UserStatistics/Default_Report.cs b/OpenSim/Region/UserStatistics/Default_Report.cs index 0e17630..cdc615c 100644 --- a/OpenSim/Region/UserStatistics/Default_Report.cs +++ b/OpenSim/Region/UserStatistics/Default_Report.cs | |||
@@ -33,7 +33,7 @@ using System.Text; | |||
33 | using Mono.Data.SqliteClient; | 33 | using Mono.Data.SqliteClient; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Framework.Statistics; | 36 | using OpenSim.Framework.Monitoring; |
37 | 37 | ||
38 | 38 | ||
39 | namespace OpenSim.Region.UserStatistics | 39 | namespace OpenSim.Region.UserStatistics |
diff --git a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs index 811baba..74de46b 100644 --- a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs +++ b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs | |||
@@ -34,7 +34,7 @@ using System.Text.RegularExpressions; | |||
34 | using Mono.Data.SqliteClient; | 34 | using Mono.Data.SqliteClient; |
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Framework.Statistics; | 37 | using OpenSim.Framework.Monitoring; |
38 | 38 | ||
39 | namespace OpenSim.Region.UserStatistics | 39 | namespace OpenSim.Region.UserStatistics |
40 | { | 40 | { |
diff --git a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs index 8c04e71..28051fb 100644 --- a/OpenSim/Region/UserStatistics/SimStatsAJAX.cs +++ b/OpenSim/Region/UserStatistics/SimStatsAJAX.cs | |||
@@ -33,7 +33,7 @@ using System.Text; | |||
33 | using Mono.Data.SqliteClient; | 33 | using Mono.Data.SqliteClient; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Framework.Statistics; | 36 | using OpenSim.Framework.Monitoring; |
37 | 37 | ||
38 | namespace OpenSim.Region.UserStatistics | 38 | namespace OpenSim.Region.UserStatistics |
39 | { | 39 | { |
diff --git a/prebuild.xml b/prebuild.xml index e6f8c21..7a235e1 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -235,7 +235,7 @@ | |||
235 | </Files> | 235 | </Files> |
236 | </Project> | 236 | </Project> |
237 | 237 | ||
238 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library"> | 238 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library"> |
239 | <Configuration name="Debug"> | 239 | <Configuration name="Debug"> |
240 | <Options> | 240 | <Options> |
241 | <OutputPath>../../../bin/</OutputPath> | 241 | <OutputPath>../../../bin/</OutputPath> |
@@ -437,7 +437,7 @@ | |||
437 | <Reference name="OpenSim.Framework"/> | 437 | <Reference name="OpenSim.Framework"/> |
438 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 438 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
439 | <Reference name="OpenSim.Framework.Console"/> | 439 | <Reference name="OpenSim.Framework.Console"/> |
440 | <Reference name="OpenSim.Framework.Statistics"/> | 440 | <Reference name="OpenSim.Framework.Monitoring"/> |
441 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 441 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
442 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 442 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
443 | <Reference name="XMLRPC" path="../../../bin/"/> | 443 | <Reference name="XMLRPC" path="../../../bin/"/> |
@@ -602,9 +602,9 @@ | |||
602 | <Reference name="System.Xml"/> | 602 | <Reference name="System.Xml"/> |
603 | <Reference name="System.Web"/> | 603 | <Reference name="System.Web"/> |
604 | <Reference name="OpenSim.Framework"/> | 604 | <Reference name="OpenSim.Framework"/> |
605 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
605 | <Reference name="OpenSim.Framework.Servers"/> | 606 | <Reference name="OpenSim.Framework.Servers"/> |
606 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 607 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
607 | <Reference name="OpenSim.Framework.Statistics"/> | ||
608 | <Reference name="OpenSim.Services.Interfaces"/> | 608 | <Reference name="OpenSim.Services.Interfaces"/> |
609 | <Reference name="OpenMetaverse" path="../../bin/"/> | 609 | <Reference name="OpenMetaverse" path="../../bin/"/> |
610 | <Reference name="OpenMetaverseTypes" path="../../bin/"/> | 610 | <Reference name="OpenMetaverseTypes" path="../../bin/"/> |
@@ -636,13 +636,13 @@ | |||
636 | <Reference name="System"/> | 636 | <Reference name="System"/> |
637 | <Reference name="System.Xml"/> | 637 | <Reference name="System.Xml"/> |
638 | <Reference name="System.Web"/> | 638 | <Reference name="System.Web"/> |
639 | <Reference name="OpenSim.Data"/> | ||
639 | <Reference name="OpenSim.Framework"/> | 640 | <Reference name="OpenSim.Framework"/> |
640 | <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> | 641 | <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> |
641 | <Reference name="OpenSim.Data"/> | 642 | <Reference name="OpenSim.Framework.Console"/> |
643 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
642 | <Reference name="OpenSim.Framework.Servers"/> | 644 | <Reference name="OpenSim.Framework.Servers"/> |
643 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 645 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
644 | <Reference name="OpenSim.Framework.Console"/> | ||
645 | <Reference name="OpenSim.Framework.Statistics"/> | ||
646 | <Reference name="OpenSim.Services.Interfaces"/> | 646 | <Reference name="OpenSim.Services.Interfaces"/> |
647 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 647 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
648 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 648 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
@@ -688,10 +688,10 @@ | |||
688 | <Reference name="OpenSim.Framework.Communications"/> | 688 | <Reference name="OpenSim.Framework.Communications"/> |
689 | <Reference name="OpenSim.Data"/> | 689 | <Reference name="OpenSim.Data"/> |
690 | <Reference name="OpenSim.Framework.Console"/> | 690 | <Reference name="OpenSim.Framework.Console"/> |
691 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
691 | <Reference name="OpenSim.Framework.Serialization"/> | 692 | <Reference name="OpenSim.Framework.Serialization"/> |
692 | <Reference name="OpenSim.Framework.Servers"/> | 693 | <Reference name="OpenSim.Framework.Servers"/> |
693 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 694 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
694 | <Reference name="OpenSim.Framework.Statistics"/> | ||
695 | <Reference name="OpenSim.Region.Physics.Manager"/> | 695 | <Reference name="OpenSim.Region.Physics.Manager"/> |
696 | 696 | ||
697 | <!-- For scripting in funny languages by default --> | 697 | <!-- For scripting in funny languages by default --> |
@@ -1406,10 +1406,10 @@ | |||
1406 | <Reference name="OpenSim.Framework"/> | 1406 | <Reference name="OpenSim.Framework"/> |
1407 | <Reference name="OpenSim.Framework.Communications"/> | 1407 | <Reference name="OpenSim.Framework.Communications"/> |
1408 | <Reference name="OpenSim.Framework.Console"/> | 1408 | <Reference name="OpenSim.Framework.Console"/> |
1409 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1409 | <Reference name="OpenSim.Framework.Serialization"/> | 1410 | <Reference name="OpenSim.Framework.Serialization"/> |
1410 | <Reference name="OpenSim.Framework.Servers"/> | 1411 | <Reference name="OpenSim.Framework.Servers"/> |
1411 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1412 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1412 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1413 | <Reference name="OpenSim.Region.Framework"/> | 1413 | <Reference name="OpenSim.Region.Framework"/> |
1414 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1414 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1415 | <Reference name="OpenSim.Server.Base"/> | 1415 | <Reference name="OpenSim.Server.Base"/> |
@@ -1497,11 +1497,11 @@ | |||
1497 | <Reference name="OpenSim.Region.Framework"/> | 1497 | <Reference name="OpenSim.Region.Framework"/> |
1498 | <Reference name="OpenSim.Framework"/> | 1498 | <Reference name="OpenSim.Framework"/> |
1499 | <Reference name="OpenSim.Data"/> | 1499 | <Reference name="OpenSim.Data"/> |
1500 | <Reference name="OpenSim.Framework.Console"/> | ||
1501 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1500 | <Reference name="OpenSim.Framework.Servers"/> | 1502 | <Reference name="OpenSim.Framework.Servers"/> |
1501 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1503 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1502 | <Reference name="OpenSim.Framework.Console"/> | ||
1503 | <Reference name="OpenSim.Framework.Communications"/> | 1504 | <Reference name="OpenSim.Framework.Communications"/> |
1504 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1505 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1505 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1506 | <Reference name="XMLRPC" path="../../../bin/"/> | 1506 | <Reference name="XMLRPC" path="../../../bin/"/> |
1507 | <Reference name="Nini" path="../../../bin/"/> | 1507 | <Reference name="Nini" path="../../../bin/"/> |
@@ -1534,15 +1534,15 @@ | |||
1534 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> | 1534 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> |
1535 | <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/> | 1535 | <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/> |
1536 | <Reference name="OpenMetaverse" path="../../../../../bin/"/> | 1536 | <Reference name="OpenMetaverse" path="../../../../../bin/"/> |
1537 | <Reference name="OpenSim.Region.Framework"/> | ||
1538 | <Reference name="OpenSim.Framework"/> | ||
1539 | <Reference name="OpenSim.Data"/> | 1537 | <Reference name="OpenSim.Data"/> |
1538 | <Reference name="OpenSim.Framework"/> | ||
1539 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1540 | <Reference name="OpenSim.Framework.Servers"/> | 1540 | <Reference name="OpenSim.Framework.Servers"/> |
1541 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1541 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1542 | <Reference name="OpenSim.Framework.Console"/> | 1542 | <Reference name="OpenSim.Framework.Console"/> |
1543 | <Reference name="OpenSim.Framework.Communications"/> | 1543 | <Reference name="OpenSim.Framework.Communications"/> |
1544 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1545 | <Reference name="OpenSim.Region.ClientStack"/> | 1544 | <Reference name="OpenSim.Region.ClientStack"/> |
1545 | <Reference name="OpenSim.Region.Framework"/> | ||
1546 | <Reference name="OpenSim.Services.Interfaces"/> | 1546 | <Reference name="OpenSim.Services.Interfaces"/> |
1547 | <Reference name="Nini" path="../../../../../bin/"/> | 1547 | <Reference name="Nini" path="../../../../../bin/"/> |
1548 | <Reference name="log4net" path="../../../../../bin/"/> | 1548 | <Reference name="log4net" path="../../../../../bin/"/> |
@@ -1625,9 +1625,9 @@ | |||
1625 | <Reference name="OpenSim.Framework.Communications"/> | 1625 | <Reference name="OpenSim.Framework.Communications"/> |
1626 | <Reference name="OpenSim.Data"/> | 1626 | <Reference name="OpenSim.Data"/> |
1627 | <Reference name="OpenSim.Framework.Console"/> | 1627 | <Reference name="OpenSim.Framework.Console"/> |
1628 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1628 | <Reference name="OpenSim.Framework.Servers"/> | 1629 | <Reference name="OpenSim.Framework.Servers"/> |
1629 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1630 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1630 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1631 | <Reference name="OpenSim.Region.CoreModules"/> | 1631 | <Reference name="OpenSim.Region.CoreModules"/> |
1632 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 1632 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
1633 | <Reference name="OpenSim.Region.Framework"/> | 1633 | <Reference name="OpenSim.Region.Framework"/> |
@@ -1763,15 +1763,15 @@ | |||
1763 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1763 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
1764 | <Reference name="OpenSim.Framework"/> | 1764 | <Reference name="OpenSim.Framework"/> |
1765 | <Reference name="OpenSim.Data"/> | 1765 | <Reference name="OpenSim.Data"/> |
1766 | <Reference name="OpenSim.Framework.Communications"/> | ||
1766 | <Reference name="OpenSim.Framework.Console"/> | 1767 | <Reference name="OpenSim.Framework.Console"/> |
1767 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1768 | <Reference name="OpenSim.Framework.Monitoring"/> |
1768 | <Reference name="OpenSim.Framework.Servers"/> | 1769 | <Reference name="OpenSim.Framework.Servers"/> |
1769 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1770 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1770 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1771 | <Reference name="OpenSim.Region.Framework"/> | 1771 | <Reference name="OpenSim.Region.Framework"/> |
1772 | <Reference name="OpenSim.Region.CoreModules"/> | 1772 | <Reference name="OpenSim.Region.CoreModules"/> |
1773 | <Reference name="OpenSim.Region.ClientStack"/> | 1773 | <Reference name="OpenSim.Region.ClientStack"/> |
1774 | <Reference name="OpenSim.Framework.Communications"/> | 1774 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1775 | <Reference name="OpenSim.Server.Base"/> | 1775 | <Reference name="OpenSim.Server.Base"/> |
1776 | <Reference name="OpenSim.Services.Base"/> | 1776 | <Reference name="OpenSim.Services.Base"/> |
1777 | <Reference name="OpenSim.Services.Interfaces"/> | 1777 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -2409,7 +2409,6 @@ | |||
2409 | </Files> | 2409 | </Files> |
2410 | </Project> | 2410 | </Project> |
2411 | 2411 | ||
2412 | |||
2413 | <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library"> | 2412 | <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library"> |
2414 | <Configuration name="Debug"> | 2413 | <Configuration name="Debug"> |
2415 | <Options> | 2414 | <Options> |
@@ -2438,9 +2437,9 @@ | |||
2438 | <Reference name="OpenSim.Region.Framework"/> | 2437 | <Reference name="OpenSim.Region.Framework"/> |
2439 | <Reference name="OpenSim.Region.CoreModules"/> | 2438 | <Reference name="OpenSim.Region.CoreModules"/> |
2440 | <Reference name="OpenSim.Framework.Console"/> | 2439 | <Reference name="OpenSim.Framework.Console"/> |
2440 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
2441 | <Reference name="OpenSim.Framework.Servers"/> | 2441 | <Reference name="OpenSim.Framework.Servers"/> |
2442 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2442 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
2443 | <Reference name="OpenSim.Framework.Statistics"/> | ||
2444 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2443 | <Reference name="OpenSim.Region.Physics.Manager"/> |
2445 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> | 2444 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> |
2446 | <Reference name="Mono.Addins"/> | 2445 | <Reference name="Mono.Addins"/> |
@@ -2924,9 +2923,9 @@ | |||
2924 | <Reference name="OpenSim.Framework.Serialization"/> | 2923 | <Reference name="OpenSim.Framework.Serialization"/> |
2925 | <Reference name="OpenSim.Framework.Communications"/> | 2924 | <Reference name="OpenSim.Framework.Communications"/> |
2926 | <Reference name="OpenSim.Framework.Console"/> | 2925 | <Reference name="OpenSim.Framework.Console"/> |
2926 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
2927 | <Reference name="OpenSim.Framework.Servers"/> | 2927 | <Reference name="OpenSim.Framework.Servers"/> |
2928 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2928 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
2929 | <Reference name="OpenSim.Framework.Statistics"/> | ||
2930 | <Reference name="OpenSim.Region.Framework"/> | 2929 | <Reference name="OpenSim.Region.Framework"/> |
2931 | <Reference name="OpenSim.Region.CoreModules"/> | 2930 | <Reference name="OpenSim.Region.CoreModules"/> |
2932 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2931 | <Reference name="OpenSim.Region.Physics.Manager"/> |
@@ -2996,9 +2995,9 @@ | |||
2996 | <Reference name="OpenSim.Framework.Serialization"/> | 2995 | <Reference name="OpenSim.Framework.Serialization"/> |
2997 | <Reference name="OpenSim.Framework.Communications"/> | 2996 | <Reference name="OpenSim.Framework.Communications"/> |
2998 | <Reference name="OpenSim.Framework.Console"/> | 2997 | <Reference name="OpenSim.Framework.Console"/> |
2998 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
2999 | <Reference name="OpenSim.Framework.Servers"/> | 2999 | <Reference name="OpenSim.Framework.Servers"/> |
3000 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3000 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3001 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3002 | <Reference name="OpenSim.Region.Framework"/> | 3001 | <Reference name="OpenSim.Region.Framework"/> |
3003 | <Reference name="OpenSim.Region.CoreModules"/> | 3002 | <Reference name="OpenSim.Region.CoreModules"/> |
3004 | <Reference name="OpenSim.Region.OptionalModules"/> | 3003 | <Reference name="OpenSim.Region.OptionalModules"/> |
@@ -3055,8 +3054,8 @@ | |||
3055 | <Reference name="OpenSim.Framework"/> | 3054 | <Reference name="OpenSim.Framework"/> |
3056 | <Reference name="OpenSim.Framework.Communications"/> | 3055 | <Reference name="OpenSim.Framework.Communications"/> |
3057 | <Reference name="OpenSim.Framework.Console"/> | 3056 | <Reference name="OpenSim.Framework.Console"/> |
3057 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
3058 | <Reference name="OpenSim.Framework.Servers"/> | 3058 | <Reference name="OpenSim.Framework.Servers"/> |
3059 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3060 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3059 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3061 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | 3060 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> |
3062 | <Reference name="OpenSim.Region.Framework"/> | 3061 | <Reference name="OpenSim.Region.Framework"/> |
@@ -3112,9 +3111,9 @@ | |||
3112 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> | 3111 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> |
3113 | <Reference name="OpenSim.Framework"/> | 3112 | <Reference name="OpenSim.Framework"/> |
3114 | <Reference name="OpenSim.Framework.Communications"/> | 3113 | <Reference name="OpenSim.Framework.Communications"/> |
3114 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
3115 | <Reference name="OpenSim.Framework.Servers"/> | 3115 | <Reference name="OpenSim.Framework.Servers"/> |
3116 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3116 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3117 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3118 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | 3117 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> |
3119 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 3118 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
3120 | <Reference name="OpenSim.Region.CoreModules"/> | 3119 | <Reference name="OpenSim.Region.CoreModules"/> |
@@ -3149,7 +3148,7 @@ | |||
3149 | <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> | 3148 | <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> |
3150 | <Reference name="OpenSim.Framework"/> | 3149 | <Reference name="OpenSim.Framework"/> |
3151 | <Reference name="OpenSim.Framework.Communications"/> | 3150 | <Reference name="OpenSim.Framework.Communications"/> |
3152 | <Reference name="OpenSim.Framework.Statistics"/> | 3151 | <Reference name="OpenSim.Framework.Monitoring"/> |
3153 | <Reference name="OpenSim.Region.ClientStack"/> | 3152 | <Reference name="OpenSim.Region.ClientStack"/> |
3154 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 3153 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
3155 | <Reference name="OpenSim.Region.CoreModules"/> | 3154 | <Reference name="OpenSim.Region.CoreModules"/> |