merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
author: ubit 2012-08-02 18:21:08 +0200
committer: ubit 2012-08-02 18:21:08 +0200
commit: 254d3e1ad31f99770074abb49fec03c90d99b246 (patch)
tree: fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /OpenSim/Region/UserStatistics
parent: i local libs commit (diff)
parent: Merge branch 'master' into careminster (diff)
download: opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.zip
opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz
opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2
opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz
4 files changed, 4 insertions, 4 deletions
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;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Statistics;
+using OpenSim.Framework.Monitoring;
 namespace OpenSim.Region.UserStatistics
 {
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;
 using Mono.Data.SqliteClient;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Statistics;
+using OpenSim.Framework.Monitoring;
 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;
 using Mono.Data.SqliteClient;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Statistics;
+using OpenSim.Framework.Monitoring;
 namespace OpenSim.Region.UserStatistics
 {
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;
 using Mono.Data.SqliteClient;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Statistics;
+using OpenSim.Framework.Monitoring;
 namespace OpenSim.Region.UserStatistics
 {
author	ubit	2012-08-02 18:21:08 +0200
committer	ubit	2012-08-02 18:21:08 +0200
commit	254d3e1ad31f99770074abb49fec03c90d99b246 (patch)
tree	fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /OpenSim/Region/UserStatistics
parent	i local libs commit (diff)
parent	Merge branch 'master' into careminster (diff)
download	opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.zip opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2 opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz

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	{