aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2009-02-22 20:52:55 +0000
committerCharles Krinke2009-02-22 20:52:55 +0000
commit8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch)
tree96a24a49de82056060dd9b7bab0cb209d5f1a129
parentAllow delivery of object messages gridwide (diff)
downloadopensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2
opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml. * Added missing m_log fields to classes. * Replaced Console.WriteLine with appropriate m_log.Xxxx * Tested that nant test target runs succesfully. * Tested that local opensim sandbox starts up without errors.
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLogData.cs3
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs2
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs7
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs5
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLGridTest.cs8
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs5
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs7
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLUserTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs5
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs7
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs8
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs3
-rw-r--r--OpenSim/Data/Tests/BasicEstateTest.cs3
-rw-r--r--OpenSim/Data/Tests/BasicGridTest.cs3
-rw-r--r--OpenSim/Data/Tests/BasicInventoryTest.cs3
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs7
-rw-r--r--OpenSim/Data/Tests/BasicUserTest.cs3
-rw-r--r--OpenSim/Framework/AgentCircuitManager.cs2
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs12
-rw-r--r--OpenSim/Framework/AvatarWearable.cs4
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs8
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs2
-rw-r--r--OpenSim/Framework/HGNetworkServersInfo.cs2
-rw-r--r--OpenSim/Framework/Util.cs6
-rw-r--r--OpenSim/Framework/WearableItem.cs2
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Main.cs6
-rw-r--r--OpenSim/Grid/GridServer/GridRestModule.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridXmlRpcModule.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs4
-rw-r--r--OpenSim/Region/Application/Application.cs8
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs2
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs66
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs18
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs6
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs98
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs10
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs5
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs6
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs10
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs4
-rw-r--r--OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs44
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs9
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs12
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs18
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs36
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs60
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs4
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs21
-rw-r--r--OpenSim/Region/Physics/Meshing/PrimMesher.cs11
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODETestClass.cs12
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs8
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs23
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/EventManager.cs2
-rw-r--r--OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs4
-rw-r--r--OpenSim/ScriptEngine/Shared/EventParams.cs12
-rw-r--r--prebuild.xml2
117 files changed, 581 insertions, 410 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLogData.cs b/OpenSim/Data/MSSQL/MSSQLLogData.cs
index 63cd605..1332305 100644
--- a/OpenSim/Data/MSSQL/MSSQLLogData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLogData.cs
@@ -112,8 +112,7 @@ namespace OpenSim.Data.MSSQL
112 catch (Exception e) 112 catch (Exception e)
113 { 113 {
114 //Are we not in a loop here 114 //Are we not in a loop here
115 //m_log.Error(e.ToString()); 115 m_log.Error("[LOG DB] Error logging : " + e.Message);
116 Console.WriteLine("[LOG DB] Error logging : " + e.Message);
117 } 116 }
118 } 117 }
119 } 118 }
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 3bb6857..2f14f16 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -1030,7 +1030,6 @@ namespace OpenSim.Data.MySQL
1030 { 1030 {
1031 IDbCommand result = Query(sql, parameters); 1031 IDbCommand result = Query(sql, parameters);
1032 1032
1033 //Console.WriteLine(result.CommandText);
1034 // int x; 1033 // int x;
1035 // if ((x = result.ExecuteNonQuery()) > 0) 1034 // if ((x = result.ExecuteNonQuery()) > 0)
1036 // { 1035 // {
@@ -1123,7 +1122,6 @@ namespace OpenSim.Data.MySQL
1123 { 1122 {
1124 IDbCommand result = Query(sql, parameters); 1123 IDbCommand result = Query(sql, parameters);
1125 1124
1126 //Console.WriteLine(result.CommandText);
1127 // int x; 1125 // int x;
1128 // if ((x = result.ExecuteNonQuery()) > 0) 1126 // if ((x = result.ExecuteNonQuery()) > 0)
1129 // { 1127 // {
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index d03e66c..514e04e 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLAssetTest : BasicAssetTest 37 public class MySQLAssetTest : BasicAssetTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -73,4 +76,4 @@ namespace OpenSim.Data.MySQL.Tests
73 } 76 }
74 } 77 }
75 } 78 }
76} \ No newline at end of file 79}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index f148385..79fcc2d 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLEstateTest : BasicEstateTest 37 public class MySQLEstateTest : BasicEstateTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -56,7 +59,7 @@ namespace OpenSim.Data.MySQL.Tests
56 } 59 }
57 catch (Exception e) 60 catch (Exception e)
58 { 61 {
59 Console.WriteLine("Exception {0}", e); 62 m_log.Error("Exception {0}", e);
60 Assert.Ignore(); 63 Assert.Ignore();
61 } 64 }
62 } 65 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index 953294f..fd71022 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -28,12 +28,16 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLGridTest : BasicGridTest 37 public class MySQLGridTest : BasicGridTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40
37 public string file; 41 public string file;
38 public MySQLManager database; 42 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 43 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +58,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 58 }
55 catch (Exception e) 59 catch (Exception e)
56 { 60 {
57 Console.WriteLine("Exception {0}", e); 61 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 62 Assert.Ignore();
59 } 63 }
60 } 64 }
@@ -73,4 +77,4 @@ namespace OpenSim.Data.MySQL.Tests
73 } 77 }
74 } 78 }
75 } 79 }
76} \ No newline at end of file 80}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index e03e38d..c7799e5 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLInventoryTest : BasicInventoryTest 37 public class MySQLInventoryTest : BasicInventoryTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index 5cce53b..77964d3 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLRegionTest : BasicRegionTest 37 public class MySQLRegionTest : BasicRegionTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -87,4 +90,4 @@ namespace OpenSim.Data.MySQL.Tests
87 } 90 }
88 } 91 }
89 } 92 }
90} \ No newline at end of file 93}
diff --git a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index b74617e..449ce4a 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.MySQL.Tests 34namespace OpenSim.Data.MySQL.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class MySQLUserTest : BasicUserTest 37 public class MySQLUserTest : BasicUserTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public MySQLManager database; 41 public MySQLManager database;
39 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; 42 public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.MySQL.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error("Exception {0}", e);
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -78,4 +81,4 @@ namespace OpenSim.Data.MySQL.Tests
78 } 81 }
79 } 82 }
80 } 83 }
81} \ No newline at end of file 84}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index ace7e44..2c3980b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMsSqlAssetTest : BasicAssetTest 37 public class NHibernateMsSqlAssetTest : BasicAssetTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 42
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
55 } 58 }
56 catch (Exception e) 59 catch (Exception e)
57 { 60 {
58 Console.WriteLine("Exception {0}", e); 61 m_log.Error(e.ToString());
59 Assert.Ignore(); 62 Assert.Ignore();
60 } 63 }
61 } 64 }
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests
74 } 77 }
75 78
76 } 79 }
77} \ No newline at end of file 80}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
index a44936b..7308a0e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlEstateTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMsSqlEstateTest : BasicEstateTest 37 public class NHibernateMsSqlEstateTest : BasicEstateTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 42
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
55 } 58 }
56 catch (Exception e) 59 catch (Exception e)
57 { 60 {
58 Console.WriteLine("Exception {0}", e); 61 m_log.Error(e.ToString());
59 Assert.Ignore(); 62 Assert.Ignore();
60 } 63 }
61 } 64 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index bb62b6f..2768a9e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMsSqlGridTest : BasicGridTest 37 public class NHibernateMsSqlGridTest : BasicGridTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
72 } 75 }
73 } 76 }
74 } 77 }
75} \ No newline at end of file 78}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index 6fc8abf..41c0957 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMsSqlInventoryTest : BasicInventoryTest 37 public class NHibernateMsSqlInventoryTest : BasicInventoryTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index 4d0e64d..beff3b9 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMsSqlRegionTest : BasicRegionTest 37 public class NHibernateMsSqlRegionTest : BasicRegionTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
55 } 58 }
56 catch (Exception e) 59 catch (Exception e)
57 { 60 {
58 Console.WriteLine("Exception {0}", e); 61 m_log.Error(e.ToString());
59 Assert.Ignore(); 62 Assert.Ignore();
60 } 63 }
61 } 64 }
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests
74 } 77 }
75 78
76 } 79 }
77} \ No newline at end of file 80}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index 19fd248..b09cbe6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMsSqlUserTest : BasicUserTest 37 public class NHibernateMsSqlUserTest : BasicUserTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
72 } 75 }
73 } 76 }
74 } 77 }
75} \ No newline at end of file 78}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 8bec0d3..17c65d6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMySQLAssetTest : BasicAssetTest 37 public class NHibernateMySQLAssetTest : BasicAssetTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
73 } 76 }
74 77
75 } 78 }
76} \ No newline at end of file 79}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index 4c966f5..6f5ed5f 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMySQLGridTest : BasicGridTest 37 public class NHibernateMySQLGridTest : BasicGridTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
72 } 75 }
73 } 76 }
74 } 77 }
75} \ No newline at end of file 78}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index 7f2ee4a..a7f5f5a 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMySQLInventoryTest : BasicInventoryTest 37 public class NHibernateMySQLInventoryTest : BasicInventoryTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index fa484a3..33faea6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMySQLRegionTest : BasicRegionTest 37 public class NHibernateMySQLRegionTest : BasicRegionTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
55 } 58 }
56 catch (Exception e) 59 catch (Exception e)
57 { 60 {
58 Console.WriteLine("Exception {0}", e); 61 m_log.Error(e.ToString());
59 Assert.Ignore(); 62 Assert.Ignore();
60 } 63 }
61 } 64 }
@@ -74,4 +77,4 @@ namespace OpenSim.Data.NHibernate.Tests
74 } 77 }
75 78
76 } 79 }
77} \ No newline at end of file 80}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index c316bd4..5554229 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMySQLUserTest : BasicUserTest 37 public class NHibernateMySQLUserTest : BasicUserTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
72 } 75 }
73 } 76 }
74 } 77 }
75} \ No newline at end of file 78}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
index 939f1e9..86b9df6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySqlEstateTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernateMySQLEstateTest : BasicEstateTest 37 public class NHibernateMySQLEstateTest : BasicEstateTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit"; 42 public string connect = "MySQL5Dialect;MySqlDataDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
index 6f86b0f..b51389a 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernatePostgreSQLAssetTest : BasicAssetTest 37 public class NHibernatePostgreSQLAssetTest : BasicAssetTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; 42 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
73 } 76 }
74 77
75 } 78 }
76} \ No newline at end of file 79}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
index c0a76e7..1edf20a 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLEstateTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernatePostgreSQLEstateTest : BasicEstateTest 37 public class NHibernatePostgreSQLEstateTest : BasicEstateTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; 42 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
index 084de85..a47830d 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernatePostgreSQLGridTest : BasicGridTest 37 public class NHibernatePostgreSQLGridTest : BasicGridTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; 42 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
72 } 75 }
73 } 76 }
74 } 77 }
75} \ No newline at end of file 78}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
index 869d24f..6016303 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest 37 public class NHibernatePostgreSQLInventoryTest : BasicInventoryTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; 42 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
index 0e4fc82..8b4a8f5 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernatePostgreSQLRegionTest : BasicRegionTest 37 public class NHibernatePostgreSQLRegionTest : BasicRegionTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; 42 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
73 } 76 }
74 77
75 } 78 }
76} \ No newline at end of file 79}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
index ffcb176..13d6c69 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
@@ -28,12 +28,15 @@
28using System; 28using System;
29using NUnit.Framework; 29using NUnit.Framework;
30using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Data.NHibernate.Tests 34namespace OpenSim.Data.NHibernate.Tests
33{ 35{
34 [TestFixture] 36 [TestFixture]
35 public class NHibernatePostgreSQLUserTest : BasicUserTest 37 public class NHibernatePostgreSQLUserTest : BasicUserTest
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 public string file; 40 public string file;
38 public NHibernateManager database; 41 public NHibernateManager database;
39 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"; 42 public string connect = "PostgreSQLDialect;NpgsqlDriver;Server=localhost;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;";
@@ -54,7 +57,7 @@ namespace OpenSim.Data.NHibernate.Tests
54 } 57 }
55 catch (Exception e) 58 catch (Exception e)
56 { 59 {
57 Console.WriteLine("Exception {0}", e); 60 m_log.Error(e.ToString());
58 Assert.Ignore(); 61 Assert.Ignore();
59 } 62 }
60 } 63 }
@@ -72,4 +75,4 @@ namespace OpenSim.Data.NHibernate.Tests
72 } 75 }
73 } 76 }
74 } 77 }
75} \ No newline at end of file 78}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index 1f98949..e89a14e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -29,12 +29,15 @@ using System;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace OpenSim.Data.NHibernate.Tests
34{ 36{
35 [TestFixture] 37 [TestFixture]
36 public class NHibernateSQLiteAssetTest : BasicAssetTest 38 public class NHibernateSQLiteAssetTest : BasicAssetTest
37 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 public string file; 41 public string file;
39 public NHibernateManager database; 42 public NHibernateManager database;
40 43
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
56 } 59 }
57 catch (Exception e) 60 catch (Exception e)
58 { 61 {
59 Console.WriteLine("Exception {0}", e); 62 m_log.Error(e.ToString());
60 Assert.Ignore(); 63 Assert.Ignore();
61 } 64 }
62 } 65 }
@@ -75,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests
75 } 78 }
76 79
77 } 80 }
78} \ No newline at end of file 81}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
index b51bff2..23fac9a 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteEstateTest.cs
@@ -29,12 +29,15 @@ using System;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace OpenSim.Data.NHibernate.Tests
34{ 36{
35 [TestFixture] 37 [TestFixture]
36 public class NHibernateSQLiteEstateTest : BasicEstateTest 38 public class NHibernateSQLiteEstateTest : BasicEstateTest
37 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 public string file; 41 public string file;
39 public NHibernateManager database; 42 public NHibernateManager database;
40 43
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
56 } 59 }
57 catch (Exception e) 60 catch (Exception e)
58 { 61 {
59 Console.WriteLine("Exception {0}", e); 62 m_log.Error(e.ToString());
60 Assert.Ignore(); 63 Assert.Ignore();
61 } 64 }
62 } 65 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index b9fe8b9..2c3d4de 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -29,12 +29,15 @@ using System;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace OpenSim.Data.NHibernate.Tests
34{ 36{
35 [TestFixture] 37 [TestFixture]
36 public class NHibernateSQLiteGridTest : BasicGridTest 38 public class NHibernateSQLiteGridTest : BasicGridTest
37 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 public string file; 41 public string file;
39 public NHibernateManager database; 42 public NHibernateManager database;
40 public string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3"; 43 public string connect = "SQLiteDialect;SQLite20Driver;Data Source=" + Path.GetTempFileName() + ".db;Version=3";
@@ -55,7 +58,7 @@ namespace OpenSim.Data.NHibernate.Tests
55 } 58 }
56 catch (Exception e) 59 catch (Exception e)
57 { 60 {
58 Console.WriteLine("Exception {0}", e); 61 m_log.Error(e.ToString());
59 Assert.Ignore(); 62 Assert.Ignore();
60 } 63 }
61 } 64 }
@@ -73,4 +76,4 @@ namespace OpenSim.Data.NHibernate.Tests
73 } 76 }
74 } 77 }
75 } 78 }
76} \ No newline at end of file 79}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index f31fc5b..adccd12 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -29,12 +29,15 @@ using System;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace OpenSim.Data.NHibernate.Tests
34{ 36{
35 [TestFixture] 37 [TestFixture]
36 public class NHibernateSQLiteInventoryTest : BasicInventoryTest 38 public class NHibernateSQLiteInventoryTest : BasicInventoryTest
37 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 public string file; 41 public string file;
39 public NHibernateManager database; 42 public NHibernateManager database;
40 43
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
56 } 59 }
57 catch (Exception e) 60 catch (Exception e)
58 { 61 {
59 Console.WriteLine("Exception {0}", e); 62 m_log.Error(e.ToString());
60 Assert.Ignore(); 63 Assert.Ignore();
61 } 64 }
62 } 65 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index d902dfd..83f4d36 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -29,12 +29,15 @@ using System;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace OpenSim.Data.NHibernate.Tests
34{ 36{
35 [TestFixture] 37 [TestFixture]
36 public class NHibernateSQLiteRegionTest : BasicRegionTest 38 public class NHibernateSQLiteRegionTest : BasicRegionTest
37 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 public string file; 41 public string file;
39 public NHibernateManager database; 42 public NHibernateManager database;
40 43
@@ -56,7 +59,7 @@ namespace OpenSim.Data.NHibernate.Tests
56 } 59 }
57 catch (Exception e) 60 catch (Exception e)
58 { 61 {
59 Console.WriteLine("Exception {0}", e); 62 m_log.Error(e.ToString());
60 Assert.Ignore(); 63 Assert.Ignore();
61 } 64 }
62 } 65 }
@@ -75,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests
75 } 78 }
76 79
77 } 80 }
78} \ No newline at end of file 81}
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index 78ab00f..a742c8e 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -29,12 +29,16 @@ using System;
29using System.IO; 29using System.IO;
30using NUnit.Framework; 30using NUnit.Framework;
31using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Data.NHibernate.Tests 35namespace OpenSim.Data.NHibernate.Tests
34{ 36{
37
35 [TestFixture] 38 [TestFixture]
36 public class NHibernateSQLiteUserTest : BasicUserTest 39 public class NHibernateSQLiteUserTest : BasicUserTest
37 { 40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 public string file; 42 public string file;
39 public NHibernateManager database; 43 public NHibernateManager database;
40 44
@@ -56,7 +60,7 @@ namespace OpenSim.Data.NHibernate.Tests
56 } 60 }
57 catch (Exception e) 61 catch (Exception e)
58 { 62 {
59 Console.WriteLine("Exception {0}", e); 63 m_log.Error(e.ToString());
60 Assert.Ignore(); 64 Assert.Ignore();
61 } 65 }
62 } 66 }
@@ -74,4 +78,4 @@ namespace OpenSim.Data.NHibernate.Tests
74 } 78 }
75 } 79 }
76 } 80 }
77} \ No newline at end of file 81}
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 500b646..e7faebb 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -31,11 +31,14 @@ using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using log4net;
35using System.Reflection;
34 36
35namespace OpenSim.Data.Tests 37namespace OpenSim.Data.Tests
36{ 38{
37 public class BasicAssetTest 39 public class BasicAssetTest
38 { 40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 public AssetDataBase db; 42 public AssetDataBase db;
40 public UUID uuid1; 43 public UUID uuid1;
41 public UUID uuid2; 44 public UUID uuid2;
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs
index f94ac46..f74a222 100644
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -33,11 +33,14 @@ using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using System.Text; 35using System.Text;
36using log4net;
37using System.Reflection;
36 38
37namespace OpenSim.Data.Tests 39namespace OpenSim.Data.Tests
38{ 40{
39 public class BasicEstateTest 41 public class BasicEstateTest
40 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 public IEstateDataStore db; 44 public IEstateDataStore db;
42 public IRegionDataStore regionDb; 45 public IRegionDataStore regionDb;
43 46
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index e3256ff..8841bae 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -32,11 +32,14 @@ using log4net.Config;
32using NUnit.Framework; 32using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
34using OpenMetaverse; 34using OpenMetaverse;
35using log4net;
36using System.Reflection;
35 37
36namespace OpenSim.Data.Tests 38namespace OpenSim.Data.Tests
37{ 39{
38 public class BasicGridTest 40 public class BasicGridTest
39 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 public GridDataBase db; 43 public GridDataBase db;
41 public UUID region1, region2, region3; 44 public UUID region1, region2, region3;
42 public UUID zero = UUID.Zero; 45 public UUID zero = UUID.Zero;
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index 1b8a5de..e5642f1 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -31,11 +31,14 @@ using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using log4net;
35using System.Reflection;
34 36
35namespace OpenSim.Data.Tests 37namespace OpenSim.Data.Tests
36{ 38{
37 public class BasicInventoryTest 39 public class BasicInventoryTest
38 { 40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 public IInventoryDataPlugin db; 42 public IInventoryDataPlugin db;
40 public UUID zero = UUID.Zero; 43 public UUID zero = UUID.Zero;
41 44
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index dfb2200..179692a 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -36,11 +36,14 @@ using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using log4net;
40using System.Reflection;
39 41
40namespace OpenSim.Data.Tests 42namespace OpenSim.Data.Tests
41{ 43{
42 public class BasicRegionTest 44 public class BasicRegionTest
43 { 45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 public IRegionDataStore db; 47 public IRegionDataStore db;
45 public UUID zero = UUID.Zero; 48 public UUID zero = UUID.Zero;
46 public UUID region1; 49 public UUID region1;
@@ -139,7 +142,7 @@ namespace OpenSim.Data.Tests
139 } 142 }
140 catch (Exception e) 143 catch (Exception e)
141 { 144 {
142 Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e); 145 m_log.Error(e.ToString());
143 Assert.Fail(); 146 Assert.Fail();
144 } 147 }
145 148
@@ -149,7 +152,7 @@ namespace OpenSim.Data.Tests
149 } 152 }
150 catch (Exception e) 153 catch (Exception e)
151 { 154 {
152 Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e); 155 m_log.Error(e.ToString());
153 Assert.Fail(); 156 Assert.Fail();
154 } 157 }
155 158
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index f0a90a9..151faa2 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -35,11 +35,14 @@ using NUnit.Framework;
35using NUnit.Framework.SyntaxHelpers; 35using NUnit.Framework.SyntaxHelpers;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using log4net;
39using System.Reflection;
38 40
39namespace OpenSim.Data.Tests 41namespace OpenSim.Data.Tests
40{ 42{
41 public class BasicUserTest 43 public class BasicUserTest
42 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 public IUserDataPlugin db; 46 public IUserDataPlugin db;
44 public UUID user1; 47 public UUID user1;
45 public UUID user2; 48 public UUID user2;
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index cf333af..d5b33f7 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Framework
122 AgentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID; 122 AgentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
123 AgentCircuits[(uint) agentData.circuitcode].SessionID = agentData.SessionID; 123 AgentCircuits[(uint) agentData.circuitcode].SessionID = agentData.SessionID;
124 124
125 // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); 125 // m_log.Debug("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
126 } 126 }
127 } 127 }
128 128
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index d8fcf74..a6cec76 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -291,17 +291,17 @@ namespace OpenSim.Framework
291 + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height 291 + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height
292 + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length 292 + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length
293 - m_avatarHeight / 2) * 0.3f - 0.04f; 293 - m_avatarHeight / 2) * 0.3f - 0.04f;
294 //System.Console.WriteLine(">>>>>>> [APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset); 294 //m_log.Debug(">>>>>>> [APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
295 //System.Console.WriteLine("------------- Set Appearance Texture ---------------"); 295 //m_log.Debug("------------- Set Appearance Texture ---------------");
296 //Primitive.TextureEntryFace[] faces = Texture.FaceTextures; 296 //Primitive.TextureEntryFace[] faces = Texture.FaceTextures;
297 //foreach (Primitive.TextureEntryFace face in faces) 297 //foreach (Primitive.TextureEntryFace face in faces)
298 //{ 298 //{
299 // if (face != null) 299 // if (face != null)
300 // System.Console.WriteLine(" ++ " + face.TextureID); 300 // m_log.Debug(" ++ " + face.TextureID);
301 // else 301 // else
302 // System.Console.WriteLine(" ++ NULL "); 302 // m_log.Debug(" ++ NULL ");
303 //} 303 //}
304 //System.Console.WriteLine("----------------------------"); 304 //m_log.Debug("----------------------------");
305 305
306 } 306 }
307 307
@@ -350,7 +350,7 @@ namespace OpenSim.Framework
350 350
351 m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float)); 351 m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float));
352 352
353 //System.Console.WriteLine("AvatarAppearance Deserialize END"); 353 //m_log.Debug("AvatarAppearance Deserialize END");
354 } 354 }
355 355
356 // this is used for OGS1 356 // this is used for OGS1
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 52f162e..1d015e5 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
50 50
51 protected AvatarWearable(SerializationInfo info, StreamingContext context) 51 protected AvatarWearable(SerializationInfo info, StreamingContext context)
52 { 52 {
53 //System.Console.WriteLine("AvatarWearable Deserialize BGN"); 53 //m_log.Debug("AvatarWearable Deserialize BGN");
54 if (info == null) 54 if (info == null)
55 { 55 {
56 throw new ArgumentNullException("info"); 56 throw new ArgumentNullException("info");
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
59 AssetID = new UUID((Guid) info.GetValue("AssetID", typeof (Guid))); 59 AssetID = new UUID((Guid) info.GetValue("AssetID", typeof (Guid)));
60 ItemID = new UUID((Guid) info.GetValue("ItemID", typeof (Guid))); 60 ItemID = new UUID((Guid) info.GetValue("ItemID", typeof (Guid)));
61 61
62 //System.Console.WriteLine("AvatarWearable Deserialize END"); 62 //m_log.Debug("AvatarWearable Deserialize END");
63 } 63 }
64 64
65 public static AvatarWearable[] DefaultWearables 65 public static AvatarWearable[] DefaultWearables
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 6752412..0060fef 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -576,10 +576,10 @@ namespace OpenSim.Framework
576 576
577 public void Dump() 577 public void Dump()
578 { 578 {
579 System.Console.WriteLine("------------ AgentData ------------"); 579 m_log.Info("------------ AgentData ------------");
580 System.Console.WriteLine("UUID: " + AgentID); 580 m_log.Info("UUID: " + AgentID);
581 System.Console.WriteLine("Region: " + RegionHandle); 581 m_log.Info("Region: " + RegionHandle);
582 System.Console.WriteLine("Position: " + Position); 582 m_log.Info("Position: " + Position);
583 } 583 }
584 } 584 }
585 */ 585 */
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0e1f948..2690e4e 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -510,11 +510,11 @@ namespace OpenSim.Framework.Communications.Cache
510 //inventory asset request 510 //inventory asset request
511 requestID = new UUID(transferRequest.TransferInfo.Params, 80); 511 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
512 source = 3; 512 source = 3;
513 //Console.WriteLine("asset request " + requestID); 513 //m_log.Debug("asset request " + requestID);
514 } 514 }
515 515
516 //check to see if asset is in local cache, if not we need to request it from asset server. 516 //check to see if asset is in local cache, if not we need to request it from asset server.
517 //Console.WriteLine("asset request " + requestID); 517 //m_log.Debug("asset request " + requestID);
518 if (!m_memcache.Contains(requestID)) 518 if (!m_memcache.Contains(requestID))
519 { 519 {
520 //not found asset 520 //not found asset
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a4c847d..4ab304f 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -464,7 +464,7 @@ namespace OpenSim.Framework.Communications.Capabilities
464 /// <returns></returns> 464 /// <returns></returns>
465 public string RequestTexture(string request, string path, string param) 465 public string RequestTexture(string request, string path, string param)
466 { 466 {
467 System.Console.WriteLine("texture request " + request); 467 m_log.Debug("texture request " + request);
468 // Needs implementing (added to remove compiler warning) 468 // Needs implementing (added to remove compiler warning)
469 return String.Empty; 469 return String.Empty;
470 } 470 }
@@ -670,7 +670,7 @@ namespace OpenSim.Framework.Communications.Capabilities
670 } 670 }
671 } 671 }
672 672
673 //System.Console.WriteLine("asset upload request via CAPS" + llsdRequest.inventory_type +" , "+ llsdRequest.asset_type); 673 //m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type +" , "+ llsdRequest.asset_type);
674 674
675 string assetName = llsdRequest.name; 675 string assetName = llsdRequest.name;
676 string assetDes = llsdRequest.description; 676 string assetDes = llsdRequest.description;
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 1f88062..588a39a 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Console
126 if (!dict.ContainsKey(helpPart)) 126 if (!dict.ContainsKey(helpPart))
127 break; 127 break;
128 128
129 //System.Console.WriteLine("Found {0}", helpParts[0]); 129 //m_log.Debug("Found {0}", helpParts[0]);
130 130
131 if (dict[helpPart] is Dictionary<string, Object>) 131 if (dict[helpPart] is Dictionary<string, Object>)
132 dict = (Dictionary<string, object>)dict[helpPart]; 132 dict = (Dictionary<string, object>)dict[helpPart];
diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs
index 803c712..c4d1318 100644
--- a/OpenSim/Framework/HGNetworkServersInfo.cs
+++ b/OpenSim/Framework/HGNetworkServersInfo.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
58 { 58 {
59 string userServerURI = ServerURI(userserver); 59 string userServerURI = ServerURI(userserver);
60 bool ret = (((userServerURI == null) || (userServerURI == "") || (userServerURI == LocalUserServerURI))); 60 bool ret = (((userServerURI == null) || (userServerURI == "") || (userServerURI == LocalUserServerURI)));
61 //Console.WriteLine("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")"); 61 //m_log.Debug("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
62 return ret; 62 return ret;
63 } 63 }
64 64
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index dcac9f1..2718072 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -700,8 +700,7 @@ namespace OpenSim.Framework
700 } 700 }
701 catch (Exception e) 701 catch (Exception e)
702 { 702 {
703 System.Console.WriteLine(e.Message); 703 m_log.Error(e.ToString());
704 System.Console.WriteLine(e.StackTrace);
705 } 704 }
706 finally 705 finally
707 { 706 {
@@ -728,8 +727,7 @@ namespace OpenSim.Framework
728 } 727 }
729 catch (Exception e) 728 catch (Exception e)
730 { 729 {
731 System.Console.WriteLine(e.Message); 730 m_log.Error(e.ToString());
732 System.Console.WriteLine(e.StackTrace);
733 } 731 }
734 finally 732 finally
735 { 733 {
diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs
index 7a4b4de..6675127 100644
--- a/OpenSim/Framework/WearableItem.cs
+++ b/OpenSim/Framework/WearableItem.cs
@@ -264,7 +264,7 @@ namespace OpenSim.Framework
264 foreach (string line in lines) 264 foreach (string line in lines)
265 { 265 {
266 string trimLine = line.Trim(); 266 string trimLine = line.Trim();
267 // Console.WriteLine("line : " + trimLine); 267 // m_log.Debug("line : " + trimLine);
268 268
269 string[] splitLine = r.Split(trimLine); 269 string[] splitLine = r.Split(trimLine);
270 if (splitLine.Length > 1) 270 if (splitLine.Length > 1)
diff --git a/OpenSim/Grid/AssetInventoryServer/Main.cs b/OpenSim/Grid/AssetInventoryServer/Main.cs
index 67aaf95..598b754 100644
--- a/OpenSim/Grid/AssetInventoryServer/Main.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Main.cs
@@ -28,11 +28,15 @@
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using log4net.Config; 30using log4net.Config;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Grid.AssetInventoryServer 34namespace OpenSim.Grid.AssetInventoryServer
33{ 35{
34 class MainEntry 36 class MainEntry
35 { 37 {
38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39
36 static void Main(string[] args) 40 static void Main(string[] args)
37 { 41 {
38 XmlConfigurator.Configure(); 42 XmlConfigurator.Configure();
@@ -46,7 +50,7 @@ namespace OpenSim.Grid.AssetInventoryServer
46 Console.CancelKeyPress += 50 Console.CancelKeyPress +=
47 delegate(object sender, ConsoleCancelEventArgs e) 51 delegate(object sender, ConsoleCancelEventArgs e)
48 { 52 {
49 Console.WriteLine("AssetInventory server is shutting down..."); 53 m_log.Info("AssetInventory server is shutting down...");
50 server.Shutdown(); 54 server.Shutdown();
51 Environment.Exit(0); 55 Environment.Exit(0);
52 }; 56 };
diff --git a/OpenSim/Grid/GridServer/GridRestModule.cs b/OpenSim/Grid/GridServer/GridRestModule.cs
index e0c1288..7d3bd18 100644
--- a/OpenSim/Grid/GridServer/GridRestModule.cs
+++ b/OpenSim/Grid/GridServer/GridRestModule.cs
@@ -182,7 +182,7 @@ namespace OpenSim.Grid.GridServer
182 public string RestSetSimMethod(string request, string path, string param, 182 public string RestSetSimMethod(string request, string path, string param,
183 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 183 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
184 { 184 {
185 Console.WriteLine("Processing region update via REST method"); 185 m_log.Info("Processing region update via REST method");
186 RegionProfileData theSim; 186 RegionProfileData theSim;
187 theSim = m_gridDBService.GetRegion(new UUID(param)); 187 theSim = m_gridDBService.GetRegion(new UUID(param));
188 if (theSim == null) 188 if (theSim == null)
diff --git a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
index f320ccc..8998b55 100644
--- a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
@@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer
627 else if (requestData.ContainsKey("region_handle")) 627 else if (requestData.ContainsKey("region_handle"))
628 { 628 {
629 //CFK: The if/else below this makes this message redundant. 629 //CFK: The if/else below this makes this message redundant.
630 //CFK: Console.WriteLine("requesting data for region " + (string) requestData["region_handle"]); 630 //CFK: m_log.Info("requesting data for region " + (string) requestData["region_handle"]);
631 ulong regionHandle = Convert.ToUInt64((string)requestData["region_handle"]); 631 ulong regionHandle = Convert.ToUInt64((string)requestData["region_handle"]);
632 simData = m_gridDBService.GetRegion(regionHandle); 632 simData = m_gridDBService.GetRegion(regionHandle);
633 if (simData == null) 633 if (simData == null)
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index f3e9884..6229dec 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -402,7 +402,7 @@ namespace OpenSim.Grid.UserServer
402 Hashtable requestData = (Hashtable) request.Params[0]; 402 Hashtable requestData = (Hashtable) request.Params[0];
403 UserProfileData userProfile; 403 UserProfileData userProfile;
404 //CFK: this clogs the UserServer log and is not necessary at this time. 404 //CFK: this clogs the UserServer log and is not necessary at this time.
405 //CFK: Console.WriteLine("METHOD BY UUID CALLED"); 405 //CFK: m_log.Debug("METHOD BY UUID CALLED");
406 if (requestData.Contains("avatar_uuid")) 406 if (requestData.Contains("avatar_uuid"))
407 { 407 {
408 try 408 try
@@ -435,7 +435,7 @@ namespace OpenSim.Grid.UserServer
435 Hashtable requestData = (Hashtable) request.Params[0]; 435 Hashtable requestData = (Hashtable) request.Params[0];
436 UserProfileData userProfile; 436 UserProfileData userProfile;
437 //CFK: this clogs the UserServer log and is not necessary at this time. 437 //CFK: this clogs the UserServer log and is not necessary at this time.
438 //CFK: Console.WriteLine("METHOD BY UUID CALLED"); 438 //CFK: m_log.Debug("METHOD BY UUID CALLED");
439 if (requestData.Contains("avatar_uuid")) 439 if (requestData.Contains("avatar_uuid"))
440 { 440 {
441 UUID guess; 441 UUID guess;
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index b8fa786..017160a 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -55,15 +55,15 @@ namespace OpenSim
55 55
56 XmlConfigurator.Configure(); 56 XmlConfigurator.Configure();
57 57
58 Console.Write("Performing compatibility checks... "); 58 m_log.Info("Performing compatibility checks... ");
59 string supported = String.Empty; 59 string supported = String.Empty;
60 if (Util.IsEnvironmentSupported(ref supported)) 60 if (Util.IsEnvironmentSupported(ref supported))
61 { 61 {
62 Console.WriteLine(" Environment is compatible.\n"); 62 m_log.Info("Environment is compatible.\n");
63 } 63 }
64 else 64 else
65 { 65 {
66 Console.WriteLine(" Environment is unsupported (" + supported + ")\n"); 66 m_log.Warn("Environment is unsupported (" + supported + ")\n");
67 } 67 }
68 68
69 Culture.SetCurrentCulture(); 69 Culture.SetCurrentCulture();
@@ -115,7 +115,7 @@ namespace OpenSim
115 } 115 }
116 catch (Exception e) 116 catch (Exception e)
117 { 117 {
118 Console.WriteLine("Caught exception from command: {0}", e); 118 m_log.Error("Caught exception from command: {0}", e);
119 } 119 }
120 } 120 }
121 } 121 }
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index f0c57e0..f3f9f29 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -265,7 +265,7 @@ namespace OpenSim
265 if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll") 265 if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
266 { 266 {
267 m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll"; 267 m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
268 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); 268 m_log.Warn("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
269 Thread.Sleep(3000); 269 Thread.Sleep(3000);
270 } 270 }
271 271
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 6ec00fe..ded6443 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -192,7 +192,7 @@ namespace OpenSim
192 for (int i = 3; i < cmdparams.Count; i++) 192 for (int i = 3; i < cmdparams.Count; i++)
193 mapName += " " + cmdparams[i]; 193 mapName += " " + cmdparams[i];
194 194
195 Console.WriteLine(">> MapName: " + mapName); 195 m_log.Info(">> MapName: " + mapName);
196 //internalPort = Convert.ToUInt32(cmdparams[4]); 196 //internalPort = Convert.ToUInt32(cmdparams[4]);
197 //remotingPort = Convert.ToUInt32(cmdparams[5]); 197 //remotingPort = Convert.ToUInt32(cmdparams[5]);
198 } 198 }
@@ -285,7 +285,7 @@ namespace OpenSim
285 } 285 }
286 catch (Exception e) 286 catch (Exception e)
287 { 287 {
288 Console.WriteLine(e.ToString()); 288 m_log.Error(e.ToString());
289 } 289 }
290 } 290 }
291 291
@@ -323,9 +323,9 @@ namespace OpenSim
323 323
324 private void LinkRegionCmdUsage() 324 private void LinkRegionCmdUsage()
325 { 325 {
326 Console.WriteLine("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]"); 326 m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]");
327 Console.WriteLine("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]"); 327 m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]");
328 Console.WriteLine("Usage: link-region <URI_of_xml> [<exclude>]"); 328 m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]");
329 } 329 }
330 } 330 }
331} 331}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c4b025a..e643a0e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1877,7 +1877,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1877 bulkUpdate.AgentData.TransactionID = transactionId; 1877 bulkUpdate.AgentData.TransactionID = transactionId;
1878 bulkUpdate.FolderData = folderDataBlocks.ToArray(); 1878 bulkUpdate.FolderData = folderDataBlocks.ToArray();
1879 1879
1880 //Console.WriteLine("SendBulkUpdateInventory :" + bulkUpdate); 1880 //m_log.Debug("SendBulkUpdateInventory :" + bulkUpdate);
1881 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 1881 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
1882 } 1882 }
1883 } 1883 }
@@ -1920,7 +1920,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1920 items.RemoveAt(items.Count - 1); 1920 items.RemoveAt(items.Count - 1);
1921 } 1921 }
1922 1922
1923 //Console.WriteLine("SendBulkUpdateInventoryRecursive :" + bulkUpdate); 1923 //m_log.Debug("SendBulkUpdateInventoryRecursive :" + bulkUpdate);
1924 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset); 1924 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
1925 1925
1926 folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>(); 1926 folderDataBlocks = new List<BulkUpdateInventoryPacket.FolderDataBlock>();
@@ -3101,7 +3101,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3101 3101
3102 packet.ParamList = returnblock; 3102 packet.ParamList = returnblock;
3103 packet.Header.Reliable = false; 3103 packet.Header.Reliable = false;
3104 //System.Console.WriteLine("[ESTATE]: SIM--->" + packet.ToString()); 3104 //m_log.Debug("[ESTATE]: SIM--->" + packet.ToString());
3105 OutPacket(packet, ThrottleOutPacketType.Task); 3105 OutPacket(packet, ThrottleOutPacketType.Task);
3106 } 3106 }
3107 3107
@@ -3895,7 +3895,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3895 /// <returns></returns> 3895 /// <returns></returns>
3896 protected bool AgentTextureCached(IClientAPI simclient, Packet packet) 3896 protected bool AgentTextureCached(IClientAPI simclient, Packet packet)
3897 { 3897 {
3898 //Console.WriteLine("texture cached: " + packet.ToString()); 3898 //m_log.Debug("texture cached: " + packet.ToString());
3899 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; 3899 AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
3900 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); 3900 AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
3901 // TODO: don't create new blocks if recycling an old packet 3901 // TODO: don't create new blocks if recycling an old packet
@@ -3924,7 +3924,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3924 protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet) 3924 protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet)
3925 { 3925 {
3926 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; 3926 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
3927 // Console.WriteLine("new multi update packet " + multipleupdate.ToString()); 3927 // m_log.Debug("new multi update packet " + multipleupdate.ToString());
3928 Scene tScene = (Scene)m_scene; 3928 Scene tScene = (Scene)m_scene;
3929 3929
3930 for (int i = 0; i < multipleupdate.ObjectData.Length; i++) 3930 for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
@@ -3956,7 +3956,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3956 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 3956 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
3957 if (handlerUpdatePrimSinglePosition != null) 3957 if (handlerUpdatePrimSinglePosition != null)
3958 { 3958 {
3959 // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 3959 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
3960 handlerUpdatePrimSinglePosition(localId, pos1, this); 3960 handlerUpdatePrimSinglePosition(localId, pos1, this);
3961 } 3961 }
3962 break; 3962 break;
@@ -3966,7 +3966,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3966 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 3966 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
3967 if (handlerUpdatePrimSingleRotation != null) 3967 if (handlerUpdatePrimSingleRotation != null)
3968 { 3968 {
3969 //Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 3969 //m_log.Debug("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
3970 handlerUpdatePrimSingleRotation(localId, rot1, this); 3970 handlerUpdatePrimSingleRotation(localId, rot1, this);
3971 } 3971 }
3972 break; 3972 break;
@@ -3976,7 +3976,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3976 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; 3976 handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
3977 if (handlerUpdatePrimSingleRotation != null) 3977 if (handlerUpdatePrimSingleRotation != null)
3978 { 3978 {
3979 //Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 3979 //m_log.Debug("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
3980 handlerUpdatePrimSingleRotation(localId, rot2, this); 3980 handlerUpdatePrimSingleRotation(localId, rot2, this);
3981 } 3981 }
3982 break; 3982 break;
@@ -3988,7 +3988,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3988 handlerUpdatePrimScale = OnUpdatePrimScale; 3988 handlerUpdatePrimScale = OnUpdatePrimScale;
3989 if (handlerUpdatePrimScale != null) 3989 if (handlerUpdatePrimScale != null)
3990 { 3990 {
3991 // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 3991 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
3992 handlerUpdatePrimScale(localId, scale1, this); 3992 handlerUpdatePrimScale(localId, scale1, this);
3993 3993
3994 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 3994 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
@@ -4026,8 +4026,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4026 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; 4026 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
4027 if (handlerUpdatePrimGroupRotation != null) 4027 if (handlerUpdatePrimGroupRotation != null)
4028 { 4028 {
4029 //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 4029 //m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
4030 // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); 4030 // m_log.Debug("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
4031 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this); 4031 handlerUpdatePrimGroupRotation(localId, pos3, rot4, this);
4032 } 4032 }
4033 break; 4033 break;
@@ -4038,12 +4038,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4038 handlerUpdatePrimScale = OnUpdatePrimScale; 4038 handlerUpdatePrimScale = OnUpdatePrimScale;
4039 if (handlerUpdatePrimScale != null) 4039 if (handlerUpdatePrimScale != null)
4040 { 4040 {
4041 //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 4041 //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
4042 handlerUpdatePrimScale(localId, scale2, this); 4042 handlerUpdatePrimScale(localId, scale2, this);
4043 4043
4044 // Change the position based on scale (for bug number 246) 4044 // Change the position based on scale (for bug number 246)
4045 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 4045 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
4046 // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); 4046 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
4047 if (handlerUpdatePrimSinglePosition != null) 4047 if (handlerUpdatePrimSinglePosition != null)
4048 { 4048 {
4049 handlerUpdatePrimSinglePosition(localId, pos4, this); 4049 handlerUpdatePrimSinglePosition(localId, pos4, this);
@@ -4057,7 +4057,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4057 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; 4057 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
4058 if (handlerUpdatePrimGroupScale != null) 4058 if (handlerUpdatePrimGroupScale != null)
4059 { 4059 {
4060 // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 4060 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
4061 handlerUpdatePrimGroupScale(localId, scale5, this); 4061 handlerUpdatePrimGroupScale(localId, scale5, this);
4062 handlerUpdateVector = OnUpdatePrimGroupPosition; 4062 handlerUpdateVector = OnUpdatePrimGroupPosition;
4063 4063
@@ -4074,7 +4074,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4074 handlerUpdatePrimScale = OnUpdatePrimScale; 4074 handlerUpdatePrimScale = OnUpdatePrimScale;
4075 if (handlerUpdatePrimScale != null) 4075 if (handlerUpdatePrimScale != null)
4076 { 4076 {
4077 // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); 4077 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
4078 handlerUpdatePrimScale(localId, scale6, this); 4078 handlerUpdatePrimScale(localId, scale6, this);
4079 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; 4079 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
4080 if (handlerUpdatePrimSinglePosition != null) 4080 if (handlerUpdatePrimSinglePosition != null)
@@ -4733,7 +4733,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4733 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack; 4733 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack;
4734 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData; 4734 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData;
4735 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data; 4735 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data;
4736 //Console.WriteLine("Agent Sends:" + Utils.BytesToString(querydata.Name)); 4736 //m_log.Debug("Agent Sends:" + Utils.BytesToString(querydata.Name));
4737 4737
4738 handlerAvatarPickerRequest = OnAvatarPickerRequest; 4738 handlerAvatarPickerRequest = OnAvatarPickerRequest;
4739 if (handlerAvatarPickerRequest != null) 4739 if (handlerAvatarPickerRequest != null)
@@ -5285,7 +5285,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5285 5285
5286 case PacketType.RequestImage: 5286 case PacketType.RequestImage:
5287 RequestImagePacket imageRequest = (RequestImagePacket)Pack; 5287 RequestImagePacket imageRequest = (RequestImagePacket)Pack;
5288 //Console.WriteLine("image request: " + Pack.ToString()); 5288 //m_log.Debug("image request: " + Pack.ToString());
5289 5289
5290 //handlerTextureRequest = null; 5290 //handlerTextureRequest = null;
5291 5291
@@ -5311,10 +5311,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5311 } 5311 }
5312 break; 5312 break;
5313 case PacketType.TransferRequest: 5313 case PacketType.TransferRequest:
5314 //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); 5314 //m_log.Debug("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
5315 5315
5316 TransferRequestPacket transfer = (TransferRequestPacket)Pack; 5316 TransferRequestPacket transfer = (TransferRequestPacket)Pack;
5317 //Console.WriteLine("Transfer Request: " + transfer.ToString()); 5317 //m_log.Debug("Transfer Request: " + transfer.ToString());
5318 // Validate inventory transfers 5318 // Validate inventory transfers
5319 // Has to be done here, because AssetCache can't do it 5319 // Has to be done here, because AssetCache can't do it
5320 // 5320 //
@@ -5409,8 +5409,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5409 break; 5409 break;
5410 case PacketType.AssetUploadRequest: 5410 case PacketType.AssetUploadRequest:
5411 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; 5411 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
5412 // Console.WriteLine("upload request " + request.ToString()); 5412 // m_log.Debug("upload request " + request.ToString());
5413 // Console.WriteLine("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString()); 5413 // m_log.Debug("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
5414 UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); 5414 UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);
5415 5415
5416 handlerAssetUploadRequest = OnAssetUploadRequest; 5416 handlerAssetUploadRequest = OnAssetUploadRequest;
@@ -5606,7 +5606,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5606 } 5606 }
5607 } 5607 }
5608 } 5608 }
5609 //Console.WriteLine(Pack.ToString()); 5609 //m_log.Debug(Pack.ToString());
5610 /*for (int i = 0; i < update.InventoryData.Length; i++) 5610 /*for (int i = 0; i < update.InventoryData.Length; i++)
5611 { 5611 {
5612 if (update.InventoryData[i].TransactionID != UUID.Zero) 5612 if (update.InventoryData[i].TransactionID != UUID.Zero)
@@ -5614,7 +5614,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5614 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId)); 5614 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionId));
5615 if (asset != null) 5615 if (asset != null)
5616 { 5616 {
5617 // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache"); 5617 // m_log.Debug("updating inventory item, found asset" + asset.FullID.ToString() + " already in cache");
5618 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 5618 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
5619 } 5619 }
5620 else 5620 else
@@ -5622,12 +5622,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5622 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); 5622 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
5623 if (asset != null) 5623 if (asset != null)
5624 { 5624 {
5625 //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache"); 5625 //m_log.Debug("updating inventory item, adding asset" + asset.FullID.ToString() + " to cache");
5626 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset); 5626 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
5627 } 5627 }
5628 else 5628 else
5629 { 5629 {
5630 //Console.WriteLine("trying to update inventory item, but asset is null"); 5630 //m_log.Debug("trying to update inventory item, but asset is null");
5631 } 5631 }
5632 } 5632 }
5633 } 5633 }
@@ -5778,7 +5778,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5778 break; 5778 break;
5779 5779
5780 case PacketType.RezScript: 5780 case PacketType.RezScript:
5781 //Console.WriteLine(Pack.ToString()); 5781 //m_log.Debug(Pack.ToString());
5782 RezScriptPacket rezScriptx = (RezScriptPacket)Pack; 5782 RezScriptPacket rezScriptx = (RezScriptPacket)Pack;
5783 5783
5784 handlerRezScript = OnRezScript; 5784 handlerRezScript = OnRezScript;
@@ -5894,7 +5894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5894 5894
5895 case PacketType.TeleportLocationRequest: 5895 case PacketType.TeleportLocationRequest:
5896 TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack; 5896 TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
5897 // Console.WriteLine(tpLocReq.ToString()); 5897 // m_log.Debug(tpLocReq.ToString());
5898 5898
5899 handlerTeleportLocationRequest = OnTeleportLocationRequest; 5899 handlerTeleportLocationRequest = OnTeleportLocationRequest;
5900 if (handlerTeleportLocationRequest != null) 5900 if (handlerTeleportLocationRequest != null)
@@ -6070,7 +6070,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6070 } 6070 }
6071 break; 6071 break;
6072 case PacketType.ParcelObjectOwnersRequest: 6072 case PacketType.ParcelObjectOwnersRequest:
6073 //Console.WriteLine(Pack.ToString()); 6073 //m_log.Debug(Pack.ToString());
6074 ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack; 6074 ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;
6075 6075
6076 handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest; 6076 handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest;
@@ -6135,7 +6135,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6135 6135
6136 case PacketType.EstateOwnerMessage: 6136 case PacketType.EstateOwnerMessage:
6137 EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; 6137 EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
6138 //System.Console.WriteLine(messagePacket.ToString()); 6138 //m_log.Debug(messagePacket.ToString());
6139 switch (Utils.BytesToString(messagePacket.MethodData.Method)) 6139 switch (Utils.BytesToString(messagePacket.MethodData.Method))
6140 { 6140 {
6141 case "getinfo": 6141 case "getinfo":
@@ -6663,7 +6663,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6663 6663
6664 case PacketType.MapItemRequest: 6664 case PacketType.MapItemRequest:
6665 MapItemRequestPacket mirpk = (MapItemRequestPacket)Pack; 6665 MapItemRequestPacket mirpk = (MapItemRequestPacket)Pack;
6666 //System.Console.WriteLine(mirpk.ToString()); 6666 //m_log.Debug(mirpk.ToString());
6667 handlerMapItemRequest = OnMapItemRequest; 6667 handlerMapItemRequest = OnMapItemRequest;
6668 if (handlerMapItemRequest != null) 6668 if (handlerMapItemRequest != null)
6669 { 6669 {
@@ -6711,7 +6711,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6711 break; 6711 break;
6712 case PacketType.DirPlacesQuery: 6712 case PacketType.DirPlacesQuery:
6713 DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack; 6713 DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack;
6714 //Console.WriteLine(dirPlacesQueryPacket.ToString()); 6714 //m_log.Debug(dirPlacesQueryPacket.ToString());
6715 6715
6716 handlerDirPlacesQuery = OnDirPlacesQuery; 6716 handlerDirPlacesQuery = OnDirPlacesQuery;
6717 if (handlerDirPlacesQuery != null) 6717 if (handlerDirPlacesQuery != null)
@@ -7674,7 +7674,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7674 7674
7675 public void SendAsset(AssetRequestToClient req) 7675 public void SendAsset(AssetRequestToClient req)
7676 { 7676 {
7677 //Console.WriteLine("sending asset " + req.RequestAssetID); 7677 //m_log.Debug("sending asset " + req.RequestAssetID);
7678 TransferInfoPacket Transfer = new TransferInfoPacket(); 7678 TransferInfoPacket Transfer = new TransferInfoPacket();
7679 Transfer.TransferInfo.ChannelType = 2; 7679 Transfer.TransferInfo.ChannelType = 2;
7680 Transfer.TransferInfo.Status = 0; 7680 Transfer.TransferInfo.Status = 0;
@@ -8161,7 +8161,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8161 mrdata.Name = Utils.StringToBytes(replies[i].name); 8161 mrdata.Name = Utils.StringToBytes(replies[i].name);
8162 mirplk.Data[i] = mrdata; 8162 mirplk.Data[i] = mrdata;
8163 } 8163 }
8164 //System.Console.WriteLine(mirplk.ToString()); 8164 //m_log.Debug(mirplk.ToString());
8165 OutPacket(mirplk, ThrottleOutPacketType.Task); 8165 OutPacket(mirplk, ThrottleOutPacketType.Task);
8166 8166
8167 } 8167 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 23ed798..0fb27d4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -32,6 +32,8 @@ using OpenMetaverse;
32using OpenMetaverse.Imaging; 32using OpenMetaverse.Imaging;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using log4net;
36using System.Reflection;
35 37
36namespace OpenSim.Region.ClientStack.LindenUDP 38namespace OpenSim.Region.ClientStack.LindenUDP
37{ 39{
@@ -41,6 +43,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
41 /// </summary> 43 /// </summary>
42 public class LLImageManager 44 public class LLImageManager
43 { 45 {
46
44 /// <summary> 47 /// <summary>
45 /// Priority Queue for images. Contains lots of data 48 /// Priority Queue for images. Contains lots of data
46 /// </summary> 49 /// </summary>
@@ -114,7 +117,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
114 if (m_shuttingdown) 117 if (m_shuttingdown)
115 return; 118 return;
116 119
117 //Console.WriteLine("AssetCallback for assetId" + assetID); 120 //m_log.Debug("AssetCallback for assetId" + assetID);
118 121
119 if (asset == null || asset.Data == null) 122 if (asset == null || asset.Data == null)
120 { 123 {
@@ -249,7 +252,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
249 } 252 }
250 253
251 // uncomment the following line to see the upper most asset and the priority 254 // uncomment the following line to see the upper most asset and the priority
252 //Console.WriteLine(process.ToString()); 255 //m_log.Debug(process.ToString());
253 256
254 // Lower priority to give the next image a chance to bubble up 257 // Lower priority to give the next image a chance to bubble up
255 pq[h] -= 50000; 258 pq[h] -= 50000;
@@ -359,6 +362,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
359 /// </summary> 362 /// </summary>
360 public class J2KImage 363 public class J2KImage
361 { 364 {
365 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
362 private AssetBase m_asset_ref = null; 366 private AssetBase m_asset_ref = null;
363 public volatile int LastPacketNum = 0; 367 public volatile int LastPacketNum = 0;
364 public volatile int DiscardLimit = 0; 368 public volatile int DiscardLimit = 0;
@@ -550,7 +554,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
550 try { Buffer.BlockCopy(m_asset_ref.Data, 0, firstImageData, 0, FIRST_IMAGE_PACKET_SIZE); } 554 try { Buffer.BlockCopy(m_asset_ref.Data, 0, firstImageData, 0, FIRST_IMAGE_PACKET_SIZE); }
551 catch (Exception) 555 catch (Exception)
552 { 556 {
553 Console.WriteLine(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(), firstImageData.Length, FIRST_IMAGE_PACKET_SIZE)); 557 m_log.Error(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(), firstImageData.Length, FIRST_IMAGE_PACKET_SIZE));
554 558
555 //m_log.Error("Texture data copy failed on first packet for " + m_asset_ref.FullID.ToString()); 559 //m_log.Error("Texture data copy failed on first packet for " + m_asset_ref.FullID.ToString());
556 //m_cancel = true; 560 //m_cancel = true;
@@ -569,8 +573,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
569 //if (imagePacketSize > 0) 573 //if (imagePacketSize > 0)
570 // imagePacketSize = IMAGE_PACKET_SIZE; 574 // imagePacketSize = IMAGE_PACKET_SIZE;
571 //if (imagePacketSize != 1000) 575 //if (imagePacketSize != 1000)
572 // Console.WriteLine("ENdPacket"); 576 // m_log.Debug("ENdPacket");
573 //Console.WriteLine(String.Format("srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(),0, imagePacketSize)); 577 //m_log.Debug(String.Format("srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize{3}", m_asset_ref.Data.Length, CurrentBytePosition(),0, imagePacketSize));
574 578
575 bool atEnd = false; 579 bool atEnd = false;
576 580
@@ -591,9 +595,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
591 try { Buffer.BlockCopy(m_asset_ref.Data, CurrentBytePosition(), imageData, 0, imagePacketSize); } 595 try { Buffer.BlockCopy(m_asset_ref.Data, CurrentBytePosition(), imageData, 0, imagePacketSize); }
592 catch (Exception e) 596 catch (Exception e)
593 { 597 {
594 Console.WriteLine(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize:{3}, currpak:{4}, stoppak:{5}, totalpak:{6}", m_asset_ref.Data.Length, CurrentBytePosition(), 598 m_log.Error(String.Format("Err: srcLen:{0}, BytePos:{1}, desLen:{2}, pktsize:{3}, currpak:{4}, stoppak:{5}, totalpak:{6}", m_asset_ref.Data.Length, CurrentBytePosition(),
595 imageData.Length, imagePacketSize, CurrentPacket, StopPacket, TexturePacketCount())); 599 imageData.Length, imagePacketSize, CurrentPacket, StopPacket, TexturePacketCount()));
596 Console.WriteLine(e.ToString()); 600 m_log.Error(e.ToString());
597 //m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString()); 601 //m_log.Error("Texture data copy failed for " + m_asset_ref.FullID.ToString());
598 //m_cancel = true; 602 //m_cancel = true;
599 //m_sending = false; 603 //m_sending = false;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 53506d3..9c231b5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
57 protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender) 57 protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender)
58 { 58 {
59 numBytes = 0; 59 numBytes = 0;
60 60
61 //System.Console.WriteLine("Queue size " + m_chunksToLoad.Count); 61 //m_log.Debug("Queue size " + m_chunksToLoad.Count);
62 62
63 if (m_chunksToLoad.Count <= 0) 63 if (m_chunksToLoad.Count <= 0)
64 return false; 64 return false;
@@ -150,4 +150,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
150 Sender = sender; 150 Sender = sender;
151 } 151 }
152 } 152 }
153} \ No newline at end of file 153}
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 08d74f3..4493591 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Communications.Hypergrid
193 { 193 {
194 if (reg.RegionLocX != x || reg.RegionLocY != y) 194 if (reg.RegionLocX != x || reg.RegionLocY != y)
195 { 195 {
196 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location"); 196 //m_log.Debug("CommsManager- RequestNeighbours() - found a different region in list, checking location");
197 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2))) 197 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2)))
198 { 198 {
199 if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2))) 199 if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2)))
@@ -239,10 +239,10 @@ namespace OpenSim.Region.Communications.Hypergrid
239 /// <returns></returns> 239 /// <returns></returns>
240 public virtual RegionInfo RequestNeighbourInfo(ulong regionHandle) 240 public virtual RegionInfo RequestNeighbourInfo(ulong regionHandle)
241 { 241 {
242 //Console.WriteLine(" >> RequestNeighbourInfo for " + regionHandle); 242 //m_log.Debug(" >> RequestNeighbourInfo for " + regionHandle);
243 foreach (RegionInfo info in m_hyperlinkRegions) 243 foreach (RegionInfo info in m_hyperlinkRegions)
244 { 244 {
245 //Console.WriteLine(" .. " + info.RegionHandle); 245 //m_log.Debug(" .. " + info.RegionHandle);
246 if (info.RegionHandle == regionHandle) return info; 246 if (info.RegionHandle == regionHandle) return info;
247 } 247 }
248 248
@@ -250,7 +250,7 @@ namespace OpenSim.Region.Communications.Hypergrid
250 { 250 {
251 if (info.RegionHandle == regionHandle) 251 if (info.RegionHandle == regionHandle)
252 { 252 {
253 //Console.WriteLine("XXX------ known region " + info.RegionHandle); 253 //m_log.Debug("XXX------ known region " + info.RegionHandle);
254 return info; 254 return info;
255 } 255 }
256 } 256 }
@@ -291,7 +291,7 @@ namespace OpenSim.Region.Communications.Hypergrid
291 map.Y = (ushort)regInfo.RegionLocY; 291 map.Y = (ushort)regInfo.RegionLocY;
292 map.WaterHeight = (byte)regInfo.RegionSettings.WaterHeight; 292 map.WaterHeight = (byte)regInfo.RegionSettings.WaterHeight;
293 map.MapImageId = regInfo.RegionSettings.TerrainImageID; 293 map.MapImageId = regInfo.RegionSettings.TerrainImageID;
294// Console.WriteLine("ImgID: " + map.MapImageId); 294 // m_log.Debug("ImgID: " + map.MapImageId);
295 map.Agents = 1; 295 map.Agents = 1;
296 map.RegionFlags = 72458694; 296 map.RegionFlags = 72458694;
297 map.Access = 13; 297 map.Access = 13;
@@ -312,10 +312,10 @@ namespace OpenSim.Region.Communications.Hypergrid
312 312
313 WebClient c = new WebClient(); 313 WebClient c = new WebClient();
314 string uri = "http://" + info.ExternalHostName + ":" + info.HttpPort + "/index.php?method=" + regionimage; 314 string uri = "http://" + info.ExternalHostName + ":" + info.HttpPort + "/index.php?method=" + regionimage;
315 //Console.WriteLine("JPEG: " + uri); 315 //m_log.Debug("JPEG: " + uri);
316 c.DownloadFile(uri, info.RegionID.ToString() + ".jpg"); 316 c.DownloadFile(uri, info.RegionID.ToString() + ".jpg");
317 Bitmap m = new Bitmap(info.RegionID.ToString() + ".jpg"); 317 Bitmap m = new Bitmap(info.RegionID.ToString() + ".jpg");
318 //Console.WriteLine("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width); 318 //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
319 byte[] imageData = OpenJPEG.EncodeFromImage(m, true); 319 byte[] imageData = OpenJPEG.EncodeFromImage(m, true);
320 AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString()); 320 AssetBase ass = new AssetBase(UUID.Random(), "region " + info.RegionID.ToString());
321 info.RegionSettings.TerrainImageID = ass.FullID; 321 info.RegionSettings.TerrainImageID = ass.FullID;
@@ -327,7 +327,7 @@ namespace OpenSim.Region.Communications.Hypergrid
327 } 327 }
328 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke 328 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
329 { 329 {
330 Console.WriteLine("[HGrid]: Failed getting/storing map image, because it is probably already in the cache"); 330 m_log.Warn("[HGrid]: Failed getting/storing map image, because it is probably already in the cache");
331 } 331 }
332 } 332 }
333 333
@@ -435,7 +435,7 @@ namespace OpenSim.Region.Communications.Hypergrid
435 { 435 {
436 hash = (Hashtable)response.Value; 436 hash = (Hashtable)response.Value;
437 //foreach (Object o in hash) 437 //foreach (Object o in hash)
438 // Console.WriteLine(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); 438 // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
439 try 439 try
440 { 440 {
441 UUID.TryParse((string)hash["uuid"], out uuid); 441 UUID.TryParse((string)hash["uuid"], out uuid);
@@ -443,7 +443,7 @@ namespace OpenSim.Region.Communications.Hypergrid
443 if ((string)hash["handle"] != null) 443 if ((string)hash["handle"] != null)
444 { 444 {
445 info.regionSecret = (string)hash["handle"]; 445 info.regionSecret = (string)hash["handle"];
446 //Console.WriteLine(">> HERE: " + info.regionSecret); 446 //m_log.Debug(">> HERE: " + info.regionSecret);
447 } 447 }
448 if (hash["region_image"] != null) 448 if (hash["region_image"] != null)
449 { 449 {
@@ -454,18 +454,18 @@ namespace OpenSim.Region.Communications.Hypergrid
454 if (hash["region_name"] != null) 454 if (hash["region_name"] != null)
455 { 455 {
456 info.RegionName = (string)hash["region_name"]; 456 info.RegionName = (string)hash["region_name"];
457 //Console.WriteLine(">> " + info.RegionName); 457 //m_log.Debug(">> " + info.RegionName);
458 } 458 }
459 if (hash["internal_port"] != null) 459 if (hash["internal_port"] != null)
460 { 460 {
461 int port = Convert.ToInt32((string)hash["internal_port"]); 461 int port = Convert.ToInt32((string)hash["internal_port"]);
462 info.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port); 462 info.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
463 //Console.WriteLine(">> " + info.InternalEndPoint.ToString()); 463 //m_log.Debug(">> " + info.InternalEndPoint.ToString());
464 } 464 }
465 if (hash["remoting_port"] != null) 465 if (hash["remoting_port"] != null)
466 { 466 {
467 info.RemotingPort = Convert.ToUInt32(hash["remoting_port"]); 467 info.RemotingPort = Convert.ToUInt32(hash["remoting_port"]);
468 //Console.WriteLine(">> " + info.RemotingPort); 468 //m_log.Debug(">> " + info.RemotingPort);
469 } 469 }
470 470
471 } 471 }
@@ -508,12 +508,12 @@ namespace OpenSim.Region.Communications.Hypergrid
508 Hashtable hash = new Hashtable(); 508 Hashtable hash = new Hashtable();
509 hash["uuid"] = regInfo.RegionID.ToString(); 509 hash["uuid"] = regInfo.RegionID.ToString();
510 hash["handle"] = regInfo.RegionHandle.ToString(); 510 hash["handle"] = regInfo.RegionHandle.ToString();
511 //Console.WriteLine(">> Here " + regInfo.RegionHandle); 511 //m_log.Debug(">> Here " + regInfo.RegionHandle);
512 hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); 512 hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
513 hash["region_name"] = regInfo.RegionName; 513 hash["region_name"] = regInfo.RegionName;
514 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); 514 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
515 hash["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString(); 515 hash["remoting_port"] = NetworkServersInfo.RemotingListenerPort.ToString();
516 //Console.WriteLine(">> Here: " + regInfo.InternalEndPoint.Port); 516 //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
517 517
518 518
519 XmlRpcResponse response = new XmlRpcResponse(); 519 XmlRpcResponse response = new XmlRpcResponse();
@@ -553,9 +553,9 @@ namespace OpenSim.Region.Communications.Hypergrid
553 if (u != null && u.UserProfile != null) 553 if (u != null && u.UserProfile != null)
554 { 554 {
555 loginParams["region_uuid"] = u.UserProfile.HomeRegionID.ToString(); // This seems to be always Zero 555 loginParams["region_uuid"] = u.UserProfile.HomeRegionID.ToString(); // This seems to be always Zero
556 //Console.WriteLine(" --------- Home Region UUID -------"); 556 //m_log.Debug(" --------- Home Region UUID -------");
557 //Console.WriteLine(" >> " + loginParams["region_uuid"] + " <<"); 557 //m_log.Debug(" >> " + loginParams["region_uuid"] + " <<");
558 //Console.WriteLine(" --------- ---------------- -------"); 558 //m_log.Debug(" --------- ---------------- -------");
559 559
560 string serverURI = ""; 560 string serverURI = "";
561 if (u.UserProfile is ForeignUserProfileData) 561 if (u.UserProfile is ForeignUserProfileData)
@@ -577,7 +577,7 @@ namespace OpenSim.Region.Communications.Hypergrid
577 if (!IsLocalUser(u)) 577 if (!IsLocalUser(u))
578 { 578 {
579 loginParams["regionhandle"] = rinfo.regionSecret; // user.CurrentAgent.Handle.ToString(); 579 loginParams["regionhandle"] = rinfo.regionSecret; // user.CurrentAgent.Handle.ToString();
580 //Console.WriteLine("XXX--- informregionofuser (foreign user) here handle: " + rinfo.regionSecret); 580 //m_log.Debug("XXX--- informregionofuser (foreign user) here handle: " + rinfo.regionSecret);
581 581
582 loginParams["home_address"] = ((ForeignUserProfileData)(u.UserProfile)).UserHomeAddress; 582 loginParams["home_address"] = ((ForeignUserProfileData)(u.UserProfile)).UserHomeAddress;
583 loginParams["home_port"] = ((ForeignUserProfileData)(u.UserProfile)).UserHomePort; 583 loginParams["home_port"] = ((ForeignUserProfileData)(u.UserProfile)).UserHomePort;
@@ -585,7 +585,7 @@ namespace OpenSim.Region.Communications.Hypergrid
585 } 585 }
586 else 586 else
587 { 587 {
588 //Console.WriteLine("XXX--- informregionofuser (local user) here handle: " + rinfo.regionSecret); 588 //m_log.Debug("XXX--- informregionofuser (local user) here handle: " + rinfo.regionSecret);
589 589
590 //// local user about to jump out, let's process the name 590 //// local user about to jump out, let's process the name
591 // On second thoughts, let's not do this for the *user*; let's only do it for the *agent* 591 // On second thoughts, let's not do this for the *user*; let's only do it for the *agent*
@@ -596,9 +596,9 @@ namespace OpenSim.Region.Communications.Hypergrid
596 loginParams["regionhandle"] = u.UserProfile.HomeRegion.ToString(); // user.CurrentAgent.Handle.ToString(); 596 loginParams["regionhandle"] = u.UserProfile.HomeRegion.ToString(); // user.CurrentAgent.Handle.ToString();
597 597
598 loginParams["home_address"] = rinfo.ExternalHostName; 598 loginParams["home_address"] = rinfo.ExternalHostName;
599 Console.WriteLine(" --------- Home Address -------"); 599 m_log.Debug(" --------- Home Address -------");
600 Console.WriteLine(" >> " + loginParams["home_address"] + " <<"); 600 m_log.Debug(" >> " + loginParams["home_address"] + " <<");
601 Console.WriteLine(" --------- ------------ -------"); 601 m_log.Debug(" --------- ------------ -------");
602 loginParams["home_port"] = rinfo.HttpPort.ToString(); 602 loginParams["home_port"] = rinfo.HttpPort.ToString();
603 loginParams["home_remoting"] = NetworkServersInfo.RemotingListenerPort.ToString(); ; 603 loginParams["home_remoting"] = NetworkServersInfo.RemotingListenerPort.ToString(); ;
604 } 604 }
@@ -614,7 +614,7 @@ namespace OpenSim.Region.Communications.Hypergrid
614 614
615 // Send 615 // Send
616 string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/"; 616 string uri = "http://" + regInfo.ExternalHostName + ":" + regInfo.HttpPort + "/";
617 //Console.WriteLine("XXX uri: " + uri); 617 //m_log.Debug("XXX uri: " + uri);
618 XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams); 618 XmlRpcRequest request = new XmlRpcRequest("expect_hg_user", SendParams);
619 XmlRpcResponse reply; 619 XmlRpcResponse reply;
620 try 620 try
@@ -722,7 +722,7 @@ namespace OpenSim.Region.Communications.Hypergrid
722 else 722 else
723 { 723 {
724 // Finally, everything looks ok 724 // Finally, everything looks ok
725 //Console.WriteLine("XXX---- EVERYTHING OK ---XXX"); 725 //m_log.Debug("XXX---- EVERYTHING OK ---XXX");
726 726
727 // 1 - Preload the user data 727 // 1 - Preload the user data
728 m_userProfileCache.PreloadUserCache(userData.ID, userData); 728 m_userProfileCache.PreloadUserCache(userData.ID, userData);
@@ -744,7 +744,7 @@ namespace OpenSim.Region.Communications.Hypergrid
744 rinfo.RegionLocX = 0; 744 rinfo.RegionLocX = 0;
745 rinfo.RegionLocY = (uint)(random.Next(0, Int32.MaxValue)); //(uint)m_knownRegions.Count; 745 rinfo.RegionLocY = (uint)(random.Next(0, Int32.MaxValue)); //(uint)m_knownRegions.Count;
746 rinfo.regionSecret = userRegionHandle.ToString(); 746 rinfo.regionSecret = userRegionHandle.ToString();
747 //Console.WriteLine("XXX--- Here: handle = " + rinfo.regionSecret); 747 //m_log.Debug("XXX--- Here: handle = " + rinfo.regionSecret);
748 try 748 try
749 { 749 {
750 rinfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)userhomeinternalport); 750 rinfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)userhomeinternalport);
@@ -828,7 +828,7 @@ namespace OpenSim.Region.Communications.Hypergrid
828 if ((uinfo != null) && (uinfo.UserProfile != null) && 828 if ((uinfo != null) && (uinfo.UserProfile != null) &&
829 (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData))) 829 (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData)))
830 { 830 {
831 //Console.WriteLine("---------------> Local User!"); 831 //m_log.Debug("---------------> Local User!");
832 string[] parts = agentData.firstname.Split(new char[] { '.' }); 832 string[] parts = agentData.firstname.Split(new char[] { '.' });
833 if (parts.Length == 2) 833 if (parts.Length == 2)
834 { 834 {
@@ -837,7 +837,7 @@ namespace OpenSim.Region.Communications.Hypergrid
837 } 837 }
838 } 838 }
839 //else 839 //else
840 // Console.WriteLine("---------------> Foreign User!"); 840 // m_log.Debug("---------------> Foreign User!");
841 } 841 }
842 #endregion 842 #endregion
843 843
@@ -938,31 +938,31 @@ namespace OpenSim.Region.Communications.Hypergrid
938 938
939 private void DumpUserData(ForeignUserProfileData userData) 939 private void DumpUserData(ForeignUserProfileData userData)
940 { 940 {
941 Console.WriteLine(" ------------ User Data Dump ----------"); 941 m_log.Info(" ------------ User Data Dump ----------");
942 Console.WriteLine(" >> Name: " + userData.FirstName + " " + userData.SurName); 942 m_log.Info(" >> Name: " + userData.FirstName + " " + userData.SurName);
943 Console.WriteLine(" >> HomeID: " + userData.HomeRegionID); 943 m_log.Info(" >> HomeID: " + userData.HomeRegionID);
944 Console.WriteLine(" >> HomeHandle: " + userData.HomeRegion); 944 m_log.Info(" >> HomeHandle: " + userData.HomeRegion);
945 Console.WriteLine(" >> HomeX: " + userData.HomeRegionX); 945 m_log.Info(" >> HomeX: " + userData.HomeRegionX);
946 Console.WriteLine(" >> HomeY: " + userData.HomeRegionY); 946 m_log.Info(" >> HomeY: " + userData.HomeRegionY);
947 Console.WriteLine(" >> UserServer: " + userData.UserServerURI); 947 m_log.Info(" >> UserServer: " + userData.UserServerURI);
948 Console.WriteLine(" >> InvServer: " + userData.UserInventoryURI); 948 m_log.Info(" >> InvServer: " + userData.UserInventoryURI);
949 Console.WriteLine(" >> AssetServer: " + userData.UserAssetURI); 949 m_log.Info(" >> AssetServer: " + userData.UserAssetURI);
950 Console.WriteLine(" ------------ -------------- ----------"); 950 m_log.Info(" ------------ -------------- ----------");
951 } 951 }
952 952
953 private void DumpRegionData(RegionInfo rinfo) 953 private void DumpRegionData(RegionInfo rinfo)
954 { 954 {
955 Console.WriteLine(" ------------ Region Data Dump ----------"); 955 m_log.Info(" ------------ Region Data Dump ----------");
956 Console.WriteLine(" >> handle: " + rinfo.RegionHandle); 956 m_log.Info(" >> handle: " + rinfo.RegionHandle);
957 Console.WriteLine(" >> coords: " + rinfo.RegionLocX + ", " + rinfo.RegionLocY); 957 m_log.Info(" >> coords: " + rinfo.RegionLocX + ", " + rinfo.RegionLocY);
958 Console.WriteLine(" >> secret: " + rinfo.regionSecret); 958 m_log.Info(" >> secret: " + rinfo.regionSecret);
959 Console.WriteLine(" >> remoting address: " + rinfo.RemotingAddress); 959 m_log.Info(" >> remoting address: " + rinfo.RemotingAddress);
960 Console.WriteLine(" >> remoting port: " + rinfo.RemotingPort); 960 m_log.Info(" >> remoting port: " + rinfo.RemotingPort);
961 Console.WriteLine(" >> external host name: " + rinfo.ExternalHostName); 961 m_log.Info(" >> external host name: " + rinfo.ExternalHostName);
962 Console.WriteLine(" >> http port: " + rinfo.HttpPort); 962 m_log.Info(" >> http port: " + rinfo.HttpPort);
963 Console.WriteLine(" >> external EP address: " + rinfo.ExternalEndPoint.Address); 963 m_log.Info(" >> external EP address: " + rinfo.ExternalEndPoint.Address);
964 Console.WriteLine(" >> external EP port: " + rinfo.ExternalEndPoint.Port); 964 m_log.Info(" >> external EP port: " + rinfo.ExternalEndPoint.Port);
965 Console.WriteLine(" ------------ -------------- ----------"); 965 m_log.Info(" ------------ -------------- ----------");
966 } 966 }
967 967
968 968
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 306ea27..33bc2fa 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -84,10 +84,10 @@ namespace OpenSim.Region.Communications.Local
84 /// <returns></returns> 84 /// <returns></returns>
85 public RegionCommsListener RegisterRegion(RegionInfo regionInfo) 85 public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
86 { 86 {
87 //Console.WriteLine("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering"); 87 //m_log.Debug("CommsManager - Region " + regionInfo.RegionHandle + " , " + regionInfo.RegionLocX + " , "+ regionInfo.RegionLocY +" is registering");
88 if (!m_regions.ContainsKey(regionInfo.RegionHandle)) 88 if (!m_regions.ContainsKey(regionInfo.RegionHandle))
89 { 89 {
90 //Console.WriteLine("CommsManager - Adding Region " + regionInfo.RegionHandle); 90 //m_log.Debug("CommsManager - Adding Region " + regionInfo.RegionHandle);
91 m_regions.Add(regionInfo.RegionHandle, regionInfo); 91 m_regions.Add(regionInfo.RegionHandle, regionInfo);
92 92
93 RegionCommsListener regionHost = new RegionCommsListener(); 93 RegionCommsListener regionHost = new RegionCommsListener();
@@ -145,15 +145,15 @@ namespace OpenSim.Region.Communications.Local
145 /// <returns></returns> 145 /// <returns></returns>
146 public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y) 146 public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
147 { 147 {
148 // Console.WriteLine("Finding Neighbours to " + regionInfo.RegionHandle); 148 // m_log.Debug("Finding Neighbours to " + regionInfo.RegionHandle);
149 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>(); 149 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
150 150
151 foreach (RegionInfo reg in m_regions.Values) 151 foreach (RegionInfo reg in m_regions.Values)
152 { 152 {
153 // Console.WriteLine("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY); 153 // m_log.Debug("CommsManager- RequestNeighbours() checking region " + reg.RegionLocX + " , "+ reg.RegionLocY);
154 if (reg.RegionLocX != x || reg.RegionLocY != y) 154 if (reg.RegionLocX != x || reg.RegionLocY != y)
155 { 155 {
156 //Console.WriteLine("CommsManager- RequestNeighbours() - found a different region in list, checking location"); 156 //m_log.Debug("CommsManager- RequestNeighbours() - found a different region in list, checking location");
157 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2))) 157 if ((reg.RegionLocX > (x - 2)) && (reg.RegionLocX < (x + 2)))
158 { 158 {
159 if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2))) 159 if ((reg.RegionLocY > (y - 2)) && (reg.RegionLocY < (y + 2)))
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index f4fe686..a239033 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -29,11 +29,14 @@ using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using log4net;
33using System.Reflection;
32 34
33namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
34{ 36{
35 public class LocalUserServices : UserManagerBase 37 public class LocalUserServices : UserManagerBase
36 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
37 private readonly uint m_defaultHomeX; 40 private readonly uint m_defaultHomeX;
38 private readonly uint m_defaultHomeY; 41 private readonly uint m_defaultHomeY;
39 42
@@ -64,7 +67,7 @@ namespace OpenSim.Region.Communications.Local
64 return profile; 67 return profile;
65 } 68 }
66 69
67 Console.WriteLine("Unknown Master User. Sandbox Mode: Creating Account"); 70 m_log.Debug("Unknown Master User. Sandbox Mode: Creating Account");
68 AddUser(firstName, lastName, password, "", m_defaultHomeX, m_defaultHomeY); 71 AddUser(firstName, lastName, password, "", m_defaultHomeX, m_defaultHomeY);
69 return GetUserProfile(firstName, lastName); 72 return GetUserProfile(firstName, lastName);
70 } 73 }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index 3c24b05..312c434 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
176 public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, 176 public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type,
177 byte[] data, bool storeLocal, bool tempFile) 177 byte[] data, bool storeLocal, bool tempFile)
178 { 178 {
179 //System.Console.WriteLine("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); 179 //m_log.Debug("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile);
180 if (((AssetType)type == AssetType.Texture || 180 if (((AssetType)type == AssetType.Texture ||
181 (AssetType)type == AssetType.Sound || 181 (AssetType)type == AssetType.Sound ||
182 (AssetType)type == AssetType.TextureTGA || 182 (AssetType)type == AssetType.TextureTGA ||
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
196 } 196 }
197 } 197 }
198 198
199 //Console.WriteLine("asset upload of " + assetID); 199 //m_log.Debug("asset upload of " + assetID);
200 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); 200 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
201 201
202 AssetXferUploader uploader = transactions.RequestXferUploader(transaction); 202 AssetXferUploader uploader = transactions.RequestXferUploader(transaction);
@@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
216 /// <param name="data"></param> 216 /// <param name="data"></param>
217 public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) 217 public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
218 { 218 {
219 //System.Console.WriteLine("xferID: " + xferID + " packetID: " + packetID + " data!"); 219 //m_log.Debug("xferID: " + xferID + " packetID: " + packetID + " data!");
220 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); 220 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
221 221
222 transactions.HandleXfer(xferID, packetID, data); 222 transactions.HandleXfer(xferID, packetID, data);
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 3fd4a70..0adafd3 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
55 55
56 public AssetTransactionModule() 56 public AssetTransactionModule()
57 { 57 {
58 // System.Console.WriteLine("creating AgentAssetTransactionModule"); 58 //m_log.Debug("creating AgentAssetTransactionModule");
59 } 59 }
60 60
61 #region IRegionModule Members 61 #region IRegionModule Members
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
64 { 64 {
65 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) 65 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
66 { 66 {
67 // System.Console.WriteLine("initialising AgentAssetTransactionModule"); 67 // m_log.Debug("initialising AgentAssetTransactionModule");
68 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene); 68 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene);
69 scene.RegisterModuleInterface<IAgentAssetTransactions>(this); 69 scene.RegisterModuleInterface<IAgentAssetTransactions>(this);
70 70
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
237 public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, 237 public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type,
238 byte[] data, bool storeLocal, bool tempFile) 238 byte[] data, bool storeLocal, bool tempFile)
239 { 239 {
240 //System.Console.WriteLine("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); 240 //m_log.Debug("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile);
241 if (((AssetType)type == AssetType.Texture || 241 if (((AssetType)type == AssetType.Texture ||
242 (AssetType)type == AssetType.Sound || 242 (AssetType)type == AssetType.Sound ||
243 (AssetType)type == AssetType.TextureTGA || 243 (AssetType)type == AssetType.TextureTGA ||
@@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
257 } 257 }
258 } 258 }
259 259
260 //Console.WriteLine("asset upload of " + assetID); 260 //m_log.Debug("asset upload of " + assetID);
261 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); 261 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
262 262
263 AssetXferUploader uploader = transactions.RequestXferUploader(transaction); 263 AssetXferUploader uploader = transactions.RequestXferUploader(transaction);
@@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
277 /// <param name="data"></param> 277 /// <param name="data"></param>
278 public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) 278 public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
279 { 279 {
280 //System.Console.WriteLine("xferID: " + xferID + " packetID: " + packetID + " data!"); 280 //m_log.Debug("xferID: " + xferID + " packetID: " + packetID + " data!");
281 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); 281 AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId);
282 282
283 transactions.HandleXfer(xferID, packetID, data); 283 transactions.HandleXfer(xferID, packetID, data);
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 2c6b51d..39dd84f 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -188,21 +188,21 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
188 188
189 public void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds) 189 public void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds)
190 { 190 {
191 //Console.WriteLine(" !!! Setting child seeds in {0} to {1}", RegionInfo.RegionName, value.Count); 191 //m_log.Debug(" !!! Setting child seeds in {0} to {1}", RegionInfo.RegionName, value.Count);
192 childrenSeeds[agentID] = seeds; 192 childrenSeeds[agentID] = seeds;
193 } 193 }
194 194
195 public void DumpChildrenSeeds(UUID agentID) 195 public void DumpChildrenSeeds(UUID agentID)
196 { 196 {
197 Console.WriteLine("================ ChildrenSeed {0} ================", m_scene.RegionInfo.RegionName); 197 m_log.Info("================ ChildrenSeed "+m_scene.RegionInfo.RegionName+" ================");
198 foreach (KeyValuePair<ulong, string> kvp in childrenSeeds[agentID]) 198 foreach (KeyValuePair<ulong, string> kvp in childrenSeeds[agentID])
199 { 199 {
200 uint x, y; 200 uint x, y;
201 Utils.LongToUInts(kvp.Key, out x, out y); 201 Utils.LongToUInts(kvp.Key, out x, out y);
202 x = x / Constants.RegionSize; 202 x = x / Constants.RegionSize;
203 y = y / Constants.RegionSize; 203 y = y / Constants.RegionSize;
204 Console.WriteLine(" >> {0}, {1}: {2}", x, y, kvp.Value); 204 m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
205 } 205 }
206 } 206 }
207 } 207 }
208} \ No newline at end of file 208}
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
index 4bfa18f..124f0f6 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
72 { 72 {
73 if (m_scene == null) 73 if (m_scene == null)
74 { 74 {
75 //Console.WriteLine("Creating Texture download module"); 75 //m_log.Debug("Creating Texture download module");
76 m_scene = scene; 76 m_scene = scene;
77 m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); 77 m_thread = new Thread(new ThreadStart(ProcessTextureSenders));
78 m_thread.Name = "ProcessTextureSenderThread"; 78 m_thread.Name = "ProcessTextureSenderThread";
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 317a935..aa33982 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Communications.Local
168 //Utils.LongToUInts(regionHandle, out x, out y); 168 //Utils.LongToUInts(regionHandle, out x, out y);
169 //x = x / Constants.RegionSize; 169 //x = x / Constants.RegionSize;
170 //y = y / Constants.RegionSize; 170 //y = y / Constants.RegionSize;
171 //Console.WriteLine("\n >>> Local SendReleaseAgent " + x + "-" + y); 171 //m_log.Debug("\n >>> Local SendReleaseAgent " + x + "-" + y);
172 foreach (Scene s in m_sceneList) 172 foreach (Scene s in m_sceneList)
173 { 173 {
174 if (s.RegionInfo.RegionHandle == regionHandle) 174 if (s.RegionInfo.RegionHandle == regionHandle)
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Communications.Local
187 //Utils.LongToUInts(regionHandle, out x, out y); 187 //Utils.LongToUInts(regionHandle, out x, out y);
188 //x = x / Constants.RegionSize; 188 //x = x / Constants.RegionSize;
189 //y = y / Constants.RegionSize; 189 //y = y / Constants.RegionSize;
190 //Console.WriteLine("\n >>> Local SendCloseAgent " + x + "-" + y); 190 //m_log.Debug("\n >>> Local SendCloseAgent " + x + "-" + y);
191 foreach (Scene s in m_sceneList) 191 foreach (Scene s in m_sceneList)
192 { 192 {
193 if (s.RegionInfo.RegionHandle == regionHandle) 193 if (s.RegionInfo.RegionHandle == regionHandle)
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index 593d621..b19f0fa 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
273 { 273 {
274 // Eventually, we want to use a caps url instead of the agentID 274 // Eventually, we want to use a caps url instead of the agentID
275 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/"; 275 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + aCircuit.AgentID + "/";
276 //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); 276 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri);
277 277
278 WebRequest AgentCreateRequest = WebRequest.Create(uri); 278 WebRequest AgentCreateRequest = WebRequest.Create(uri);
279 AgentCreateRequest.Method = "POST"; 279 AgentCreateRequest.Method = "POST";
@@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
358 { 358 {
359 // Eventually, we want to use a caps url instead of the agentID 359 // Eventually, we want to use a caps url instead of the agentID
360 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/"; 360 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + cAgentData.AgentID + "/";
361 //Console.WriteLine(" >>> DoChildAgentUpdateCall <<< " + uri); 361 //m_log.Debug(" >>> DoChildAgentUpdateCall <<< " + uri);
362 362
363 WebRequest ChildUpdateRequest = WebRequest.Create(uri); 363 WebRequest ChildUpdateRequest = WebRequest.Create(uri);
364 ChildUpdateRequest.Method = "PUT"; 364 ChildUpdateRequest.Method = "PUT";
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
440 440
441 protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri) 441 protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri)
442 { 442 {
443 //Console.WriteLine(" >>> DoReleaseAgentCall <<< " + uri); 443 //m_log.Debug(" >>> DoReleaseAgentCall <<< " + uri);
444 444
445 WebRequest request = WebRequest.Create(uri); 445 WebRequest request = WebRequest.Create(uri);
446 request.Method = "DELETE"; 446 request.Method = "DELETE";
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
474 { 474 {
475 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() +"/"; 475 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/agent/" + id + "/" + region.RegionHandle.ToString() +"/";
476 476
477 //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); 477 //m_log.Debug(" >>> DoCloseAgentCall <<< " + uri);
478 478
479 WebRequest request = WebRequest.Create(uri); 479 WebRequest request = WebRequest.Create(uri);
480 request.Method = "DELETE"; 480 request.Method = "DELETE";
@@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
508 { 508 {
509 ulong regionHandle = GetRegionHandle(region.RegionHandle); 509 ulong regionHandle = GetRegionHandle(region.RegionHandle);
510 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/"; 510 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/object/" + sog.UUID + "/" + regionHandle.ToString() + "/";
511 //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); 511 //m_log.Debug(" >>> DoCreateChildAgentCall <<< " + uri);
512 512
513 WebRequest ObjectCreateRequest = WebRequest.Create(uri); 513 WebRequest ObjectCreateRequest = WebRequest.Create(uri);
514 ObjectCreateRequest.Method = "POST"; 514 ObjectCreateRequest.Method = "POST";
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
588 protected bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion) 588 protected bool DoHelloNeighbourCall(RegionInfo region, RegionInfo thisRegion)
589 { 589 {
590 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; 590 string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/";
591 //Console.WriteLine(" >>> DoHelloNeighbourCall <<< " + uri); 591 //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri);
592 592
593 WebRequest HelloNeighbourRequest = WebRequest.Create(uri); 593 WebRequest HelloNeighbourRequest = WebRequest.Create(uri);
594 HelloNeighbourRequest.Method = "POST"; 594 HelloNeighbourRequest.Method = "POST";
@@ -681,11 +681,11 @@ namespace OpenSim.Region.CoreModules.Communications.REST
681 { 681 {
682 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); 682 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
683 683
684 //Console.WriteLine("---------------------------"); 684 //m_log.Debug("---------------------------");
685 //Console.WriteLine(" >> uri=" + request["uri"]); 685 //m_log.Debug(" >> uri=" + request["uri"]);
686 //Console.WriteLine(" >> content-type=" + request["content-type"]); 686 //m_log.Debug(" >> content-type=" + request["content-type"]);
687 //Console.WriteLine(" >> http-method=" + request["http-method"]); 687 //m_log.Debug(" >> http-method=" + request["http-method"]);
688 //Console.WriteLine("---------------------------\n"); 688 //m_log.Debug("---------------------------\n");
689 689
690 Hashtable responsedata = new Hashtable(); 690 Hashtable responsedata = new Hashtable();
691 responsedata["content_type"] = "text/html"; 691 responsedata["content_type"] = "text/html";
@@ -833,7 +833,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
833 833
834 protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle) 834 protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle)
835 { 835 {
836 //Console.WriteLine(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle); 836 //m_log.Debug(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle);
837 837
838 if (action.Equals("release")) 838 if (action.Equals("release"))
839 m_localBackend.SendReleaseAgent(regionHandle, id, ""); 839 m_localBackend.SendReleaseAgent(regionHandle, id, "");
@@ -852,11 +852,11 @@ namespace OpenSim.Region.CoreModules.Communications.REST
852 { 852 {
853 //m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called"); 853 //m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called");
854 854
855 //Console.WriteLine("---------------------------"); 855 //m_log.Debug("---------------------------");
856 //Console.WriteLine(" >> uri=" + request["uri"]); 856 //m_log.Debug(" >> uri=" + request["uri"]);
857 //Console.WriteLine(" >> content-type=" + request["content-type"]); 857 //m_log.Debug(" >> content-type=" + request["content-type"]);
858 //Console.WriteLine(" >> http-method=" + request["http-method"]); 858 //m_log.Debug(" >> http-method=" + request["http-method"]);
859 //Console.WriteLine("---------------------------\n"); 859 //m_log.Debug("---------------------------\n");
860 860
861 Hashtable responsedata = new Hashtable(); 861 Hashtable responsedata = new Hashtable();
862 responsedata["content_type"] = "text/html"; 862 responsedata["content_type"] = "text/html";
@@ -964,11 +964,11 @@ namespace OpenSim.Region.CoreModules.Communications.REST
964 { 964 {
965 //m_log.Debug("[CONNECTION DEBUGGING]: RegionHandler Called"); 965 //m_log.Debug("[CONNECTION DEBUGGING]: RegionHandler Called");
966 966
967 //Console.WriteLine("---------------------------"); 967 //m_log.Debug("---------------------------");
968 //Console.WriteLine(" >> uri=" + request["uri"]); 968 //m_log.Debug(" >> uri=" + request["uri"]);
969 //Console.WriteLine(" >> content-type=" + request["content-type"]); 969 //m_log.Debug(" >> content-type=" + request["content-type"]);
970 //Console.WriteLine(" >> http-method=" + request["http-method"]); 970 //m_log.Debug(" >> http-method=" + request["http-method"]);
971 //Console.WriteLine("---------------------------\n"); 971 //m_log.Debug("---------------------------\n");
972 972
973 Hashtable responsedata = new Hashtable(); 973 Hashtable responsedata = new Hashtable();
974 responsedata["content_type"] = "text/html"; 974 responsedata["content_type"] = "text/html";
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index c1fe5c7..203ab32 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
94 //m_scene.ForEachScenePresence(delegate (ScenePresence sp) { 94 //m_scene.ForEachScenePresence(delegate (ScenePresence sp) {
95 // if (!sp.IsChildAgent && sp.UUID == remoteClient.AgentId) 95 // if (!sp.IsChildAgent && sp.UUID == remoteClient.AgentId)
96 // { 96 // {
97 // Console.WriteLine("XXX Root agent"); 97 // m_log.Debug("XXX Root agent");
98 // DoRequestMapBlocks(remoteClient, minX, minY, maxX, maxY, flag); 98 // DoRequestMapBlocks(remoteClient, minX, minY, maxX, maxY, flag);
99 // } 99 // }
100 //}; 100 //};
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index c9a63bd..8065f42 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -375,7 +375,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
375 375
376 public OSD RequestRezAvatarMethod(string path, OSD request) 376 public OSD RequestRezAvatarMethod(string path, OSD request)
377 { 377 {
378 //System.Console.WriteLine("[REQUESTREZAVATAR]: " + request.ToString()); 378 //m_log.Debug("[REQUESTREZAVATAR]: " + request.ToString());
379 379
380 OSDMap requestMap = (OSDMap)request; 380 OSDMap requestMap = (OSDMap)request;
381 381
@@ -602,7 +602,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
602 } 602 }
603 } 603 }
604 604
605 //System.Console.WriteLine("Response:" + responseMap.ToString()); 605 //m_log.Debug("Response:" + responseMap.ToString());
606 return responseMap; 606 return responseMap;
607 } 607 }
608 608
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index ab404bd..b4ec7ae 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -35,6 +35,8 @@ using OpenMetaverse.Imaging;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using log4net;
39using System.Reflection;
38 40
39namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture 41namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
40{ 42{
@@ -86,7 +88,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
86 { 88 {
87 if (RenderPlugins.ContainsKey(contentType)) 89 if (RenderPlugins.ContainsKey(contentType))
88 { 90 {
89 //Console.WriteLine("dynamic texture being created: " + url + " of type " + contentType); 91 //m_log.Debug("dynamic texture being created: " + url + " of type " + contentType);
90 92
91 DynamicTextureUpdater updater = new DynamicTextureUpdater(); 93 DynamicTextureUpdater updater = new DynamicTextureUpdater();
92 updater.SimUUID = simID; 94 updater.SimUUID = simID;
@@ -192,6 +194,8 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
192 194
193 public class DynamicTextureUpdater 195 public class DynamicTextureUpdater
194 { 196 {
197 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
198
195 public bool BlendWithOldTexture = false; 199 public bool BlendWithOldTexture = false;
196 public string BodyData; 200 public string BodyData;
197 public string ContentType; 201 public string ContentType;
@@ -302,8 +306,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
302 } 306 }
303 catch (Exception) 307 catch (Exception)
304 { 308 {
305 Console.WriteLine( 309 m_log.Error("[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
306 "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
307 } 310 }
308 311
309 return result; 312 return result;
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index 96618e0..4abc55d 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -34,11 +34,15 @@ using OpenMetaverse;
34using OpenMetaverse.Imaging; 34using OpenMetaverse.Imaging;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using log4net;
38using System.Reflection;
37 39
38namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL 40namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
39{ 41{
40 public class LoadImageURLModule : IRegionModule, IDynamicTextureRender 42 public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
41 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45
42 private string m_name = "LoadImageURL"; 46 private string m_name = "LoadImageURL";
43 private Scene m_scene; 47 private Scene m_scene;
44 private IDynamicTextureManager m_textureManager; 48 private IDynamicTextureManager m_textureManager;
@@ -203,8 +207,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
203 } 207 }
204 catch (Exception) 208 catch (Exception)
205 { 209 {
206 Console.WriteLine( 210 m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
207 "[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
208 } 211 }
209 212
210 m_textureManager.ReturnData(state.RequestID, imageJ2000); 213 m_textureManager.ReturnData(state.RequestID, imageJ2000);
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index e7fabbe..4fb500e 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -36,6 +36,8 @@ using OpenMetaverse;
36using OpenMetaverse.Imaging; 36using OpenMetaverse.Imaging;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using log4net;
40using System.Reflection;
39 41
40//using Cairo; 42//using Cairo;
41 43
@@ -43,6 +45,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
43{ 45{
44 public class VectorRenderModule : IRegionModule, IDynamicTextureRender 46 public class VectorRenderModule : IRegionModule, IDynamicTextureRender
45 { 47 {
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49
46 private string m_name = "VectorRenderModule"; 50 private string m_name = "VectorRenderModule";
47 private Scene m_scene; 51 private Scene m_scene;
48 private IDynamicTextureManager m_textureManager; 52 private IDynamicTextureManager m_textureManager;
@@ -317,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
317 } 321 }
318 catch (Exception) 322 catch (Exception)
319 { 323 {
320 Console.WriteLine( 324 m_log.Error(
321 "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); 325 "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
322 } 326 }
323 m_textureManager.ReturnData(id, imageJ2000); 327 m_textureManager.ReturnData(id, imageJ2000);
@@ -333,7 +337,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
333 catch (Exception) 337 catch (Exception)
334 { 338 {
335 //Ckrinke: Add a WriteLine to remove the warning about 'e' defined but not used 339 //Ckrinke: Add a WriteLine to remove the warning about 'e' defined but not used
336 // Console.WriteLine("Problem with Draw. Please verify parameters." + e.ToString()); 340 // m_log.Debug("Problem with Draw. Please verify parameters." + e.ToString());
337 parsed = -1; 341 parsed = -1;
338 } 342 }
339 343
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 38cb502..d917adc 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
333 } 333 }
334 else 334 else
335 { 335 {
336 Console.WriteLine("UNABLE TO REMOVE COMPLETED REQUEST"); 336 m_log.Error("UNABLE TO REMOVE COMPLETED REQUEST");
337 } 337 }
338 } 338 }
339 } 339 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
index 1824231..58b02f9 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
@@ -28,11 +28,15 @@ using System;
28using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; 28using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
29using OpenSim.Region.Framework.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Framework.Scenes; 30using OpenSim.Region.Framework.Scenes;
31using log4net;
32using System.Reflection;
31 33
32namespace OpenSim.Region.CoreModules.World.Terrain.Effects 34namespace OpenSim.Region.CoreModules.World.Terrain.Effects
33{ 35{
34 internal class CookieCutter : ITerrainEffect 36 internal class CookieCutter : ITerrainEffect
35 { 37 {
38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39
36 #region ITerrainEffect Members 40 #region ITerrainEffect Members
37 41
38 public void RunEffect(ITerrainChannel map) 42 public void RunEffect(ITerrainChannel map)
@@ -44,7 +48,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
44 bool[,] smoothMask = new bool[map.Width,map.Height]; 48 bool[,] smoothMask = new bool[map.Width,map.Height];
45 bool[,] allowMask = new bool[map.Width,map.Height]; 49 bool[,] allowMask = new bool[map.Width,map.Height];
46 50
47 Console.WriteLine("S1"); 51 m_log.Info("S1");
48 52
49 // Step one, generate rough mask 53 // Step one, generate rough mask
50 int x, y; 54 int x, y;
@@ -52,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
52 { 56 {
53 for (y = 0; y < map.Height; y++) 57 for (y = 0; y < map.Height; y++)
54 { 58 {
55 Console.Write("."); 59 m_log.Info(".");
56 smoothMask[x, y] = true; 60 smoothMask[x, y] = true;
57 allowMask[x,y] = true; 61 allowMask[x,y] = true;
58 62
@@ -71,10 +75,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
71 } 75 }
72 } 76 }
73 77
74 Console.WriteLine("S2"); 78 m_log.Info("S2");
75 //smooth.FloodEffect(map, smoothMask, 4.0); 79 //smooth.FloodEffect(map, smoothMask, 4.0);
76 80
77 Console.WriteLine("S3"); 81 m_log.Info("S3");
78 for (x = 0; x < map.Width; x++) 82 for (x = 0; x < map.Width; x++)
79 { 83 {
80 for (y = 0; y < map.Height; y++) 84 for (y = 0; y < map.Height; y++)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index b091c60..5b28430 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
117 } 117 }
118 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke 118 catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
119 { 119 {
120 Console.WriteLine("Failed generating terrain map: " + e); 120 m_log.Error("Failed generating terrain map: " + e);
121 } 121 }
122 122
123 return imageData; 123 return imageData;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
index 8f61af7..1ab8e26 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -40,6 +40,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
40{ 40{
41 // Hue, Saturation, Value; used for color-interpolation 41 // Hue, Saturation, Value; used for color-interpolation
42 struct HSV { 42 struct HSV {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44
43 public float h; 45 public float h;
44 public float s; 46 public float s;
45 public float v; 47 public float v;
@@ -76,10 +78,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
76 // (for info about algorithm, see http://en.wikipedia.org/wiki/HSL_and_HSV) 78 // (for info about algorithm, see http://en.wikipedia.org/wiki/HSL_and_HSV)
77 public Color toColor() 79 public Color toColor()
78 { 80 {
79 if (s < 0f) Console.WriteLine("S < 0: " + s); 81 if (s < 0f) m_log.Debug("S < 0: " + s);
80 else if (s > 1f) Console.WriteLine("S > 1: " + s); 82 else if (s > 1f) m_log.Debug("S > 1: " + s);
81 if (v < 0f) Console.WriteLine("V < 0: " + v); 83 if (v < 0f) m_log.Debug("V < 0: " + v);
82 else if (v > 1f) Console.WriteLine("V > 1: " + v); 84 else if (v > 1f) m_log.Debug("V > 1: " + v);
83 85
84 float f = h / 60f; 86 float f = h / 60f;
85 int sector = (int)f % 6; 87 int sector = (int)f % 6;
diff --git a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs b/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
index 6bfa73b..38eceb1 100644
--- a/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
+++ b/OpenSim/Region/Framework/Scenes/ChildAgentDataUpdate.cs
@@ -31,6 +31,8 @@ using System.Collections.Generic;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenMetaverse.StructuredData; 33using OpenMetaverse.StructuredData;
34using log4net;
35using System.Reflection;
34 36
35namespace OpenSim.Region.Framework.Scenes 37namespace OpenSim.Region.Framework.Scenes
36{ 38{
@@ -240,6 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
240 242
241 public class AgentData : IAgentData 243 public class AgentData : IAgentData
242 { 244 {
245 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
243 private UUID m_id; 246 private UUID m_id;
244 public UUID AgentID 247 public UUID AgentID
245 { 248 {
@@ -496,10 +499,10 @@ namespace OpenSim.Region.Framework.Scenes
496 499
497 public void Dump() 500 public void Dump()
498 { 501 {
499 System.Console.WriteLine("------------ AgentData ------------"); 502 m_log.Info("------------ AgentData ------------");
500 System.Console.WriteLine("UUID: " + AgentID); 503 m_log.Info("UUID: " + AgentID);
501 System.Console.WriteLine("Region: " + RegionHandle); 504 m_log.Info("Region: " + RegionHandle);
502 System.Console.WriteLine("Position: " + Position); 505 m_log.Info("Position: " + Position);
503 } 506 }
504 } 507 }
505 508
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 5055e44..fb5c0d1 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Framework.Scenes
150 150
151 protected EntityBase(SerializationInfo info, StreamingContext context) 151 protected EntityBase(SerializationInfo info, StreamingContext context)
152 { 152 {
153 //System.Console.WriteLine("EntityBase Deserialize BGN"); 153 //m_log.Debug("EntityBase Deserialize BGN");
154 154
155 if (info == null) 155 if (info == null)
156 { 156 {
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes
187 187
188 m_localId = (uint)info.GetValue("m_localId", typeof(uint)); 188 m_localId = (uint)info.GetValue("m_localId", typeof(uint));
189 189
190 //System.Console.WriteLine("EntityBase Deserialize END"); 190 //m_log.Debug("EntityBase Deserialize END");
191 } 191 }
192 192
193 [SecurityPermission(SecurityAction.LinkDemand, 193 [SecurityPermission(SecurityAction.LinkDemand,
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 0faeef1..67cc1a1 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
126 { 126 {
127 isHomeUser = HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile); 127 isHomeUser = HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile);
128 realHandle = m_hg.FindRegionHandle(regionHandle); 128 realHandle = m_hg.FindRegionHandle(regionHandle);
129 Console.WriteLine("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString()); 129 m_log.Debug("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString());
130 } 130 }
131 /// 131 ///
132 /// Hypergrid mod stop 132 /// Hypergrid mod stop
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 039b81b..db322b4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.Framework.Scenes
358 { 358 {
359 if (ownerID == CommsManager.UserProfileCacheService.LibraryRoot.Owner) 359 if (ownerID == CommsManager.UserProfileCacheService.LibraryRoot.Owner)
360 { 360 {
361 //Console.WriteLine("request info for library item"); 361 //m_log.Debug("request info for library item");
362 return; 362 return;
363 } 363 }
364 364
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 659aaa6..2a3f068 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1538,7 +1538,7 @@ namespace OpenSim.Region.Framework.Scenes
1538 /// </returns> 1538 /// </returns>
1539 public bool CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp, bool silent) 1539 public bool CrossPrimGroupIntoNewRegion(ulong newRegionHandle, SceneObjectGroup grp, bool silent)
1540 { 1540 {
1541 //Console.WriteLine(" >>> CrossPrimGroupIntoNewRegion <<<"); 1541 //m_log.Debug(" >>> CrossPrimGroupIntoNewRegion <<<");
1542 1542
1543 bool successYN = false; 1543 bool successYN = false;
1544 grp.RootPart.UpdateFlag = 0; 1544 grp.RootPart.UpdateFlag = 0;
@@ -1695,7 +1695,7 @@ namespace OpenSim.Region.Framework.Scenes
1695 1695
1696 public bool IncomingCreateObject(ISceneObject sog) 1696 public bool IncomingCreateObject(ISceneObject sog)
1697 { 1697 {
1698 //Console.WriteLine(" >>> IncomingCreateObject <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted); 1698 //m_log.Debug(" >>> IncomingCreateObject <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
1699 SceneObjectGroup newObject; 1699 SceneObjectGroup newObject;
1700 try 1700 try
1701 { 1701 {
@@ -2482,7 +2482,7 @@ namespace OpenSim.Region.Framework.Scenes
2482 2482
2483 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) 2483 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
2484 { 2484 {
2485 //Console.WriteLine(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); 2485 //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
2486 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 2486 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
2487 if (childAgentUpdate != null) 2487 if (childAgentUpdate != null)
2488 { 2488 {
@@ -2924,7 +2924,7 @@ namespace OpenSim.Region.Framework.Scenes
2924 /// <param name="cmdparams"></param> 2924 /// <param name="cmdparams"></param>
2925 public void HandleEditCommand(string[] cmdparams) 2925 public void HandleEditCommand(string[] cmdparams)
2926 { 2926 {
2927 Console.WriteLine("Searching for Primitive: '" + cmdparams[2] + "'"); 2927 m_log.Debug("Searching for Primitive: '" + cmdparams[2] + "'");
2928 2928
2929 List<EntityBase> EntityList = GetEntities(); 2929 List<EntityBase> EntityList = GetEntities();
2930 2930
@@ -2941,7 +2941,7 @@ namespace OpenSim.Region.Framework.Scenes
2941 new Vector3(Convert.ToSingle(cmdparams[3]), Convert.ToSingle(cmdparams[4]), 2941 new Vector3(Convert.ToSingle(cmdparams[3]), Convert.ToSingle(cmdparams[4]),
2942 Convert.ToSingle(cmdparams[5]))); 2942 Convert.ToSingle(cmdparams[5])));
2943 2943
2944 Console.WriteLine("Edited scale of Primitive: " + part.Name); 2944 m_log.Debug("Edited scale of Primitive: " + part.Name);
2945 } 2945 }
2946 } 2946 }
2947 } 2947 }
@@ -3414,7 +3414,7 @@ namespace OpenSim.Region.Framework.Scenes
3414 3414
3415 public void TerrainUnAcked(IClientAPI client, int patchX, int patchY) 3415 public void TerrainUnAcked(IClientAPI client, int patchX, int patchY)
3416 { 3416 {
3417 //Console.WriteLine("Terrain packet unacked, resending patch: " + patchX + " , " + patchY); 3417 //m_log.Debug("Terrain packet unacked, resending patch: " + patchX + " , " + patchY);
3418 client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised()); 3418 client.SendLayerData(patchX, patchY, Heightmap.GetFloatsSerialised());
3419 } 3419 }
3420 3420
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9a6bd87..c3b60f8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Framework.Scenes
372 Dictionary<ulong, string> seeds 372 Dictionary<ulong, string> seeds
373 = new Dictionary<ulong, string>(avatar.Scene.CapsModule.GetChildrenSeeds(avatar.UUID)); 373 = new Dictionary<ulong, string>(avatar.Scene.CapsModule.GetChildrenSeeds(avatar.UUID));
374 374
375 //Console.WriteLine(" !!! No. of seeds: " + seeds.Count); 375 //m_log.Debug(" !!! No. of seeds: " + seeds.Count);
376 if (!seeds.ContainsKey(avatar.Scene.RegionInfo.RegionHandle)) 376 if (!seeds.ContainsKey(avatar.Scene.RegionInfo.RegionHandle))
377 seeds.Add(avatar.Scene.RegionInfo.RegionHandle, avatar.ControllingClient.RequestClientInfo().CapsPath); 377 seeds.Add(avatar.Scene.RegionInfo.RegionHandle, avatar.ControllingClient.RequestClientInfo().CapsPath);
378 378
@@ -954,7 +954,7 @@ namespace OpenSim.Region.Framework.Scenes
954 int count = 20; 954 int count = 20;
955 while (m_agentsInTransit.Contains(id) && count-- > 0) 955 while (m_agentsInTransit.Contains(id) && count-- > 0)
956 { 956 {
957 //Console.WriteLine(" >>> Waiting... " + count); 957 //m_log.Debug(" >>> Waiting... " + count);
958 Thread.Sleep(1000); 958 Thread.Sleep(1000);
959 } 959 }
960 960
@@ -966,7 +966,7 @@ namespace OpenSim.Region.Framework.Scenes
966 966
967 public bool ReleaseAgent(UUID id) 967 public bool ReleaseAgent(UUID id)
968 { 968 {
969 //Console.WriteLine(" >>> ReleaseAgent called <<< "); 969 //m_log.Debug(" >>> ReleaseAgent called <<< ");
970 return ResetFromTransit(id); 970 return ResetFromTransit(id);
971 } 971 }
972 972
@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.Framework.Scenes
1104 //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo(); 1104 //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
1105 agent.ControllingClient.RequestClientInfo(); 1105 agent.ControllingClient.RequestClientInfo();
1106 1106
1107 //Console.WriteLine("BEFORE CROSS"); 1107 //m_log.Debug("BEFORE CROSS");
1108 //Scene.DumpChildrenSeeds(UUID); 1108 //Scene.DumpChildrenSeeds(UUID);
1109 //DumpKnownRegions(); 1109 //DumpKnownRegions();
1110 string agentcaps; 1110 string agentcaps;
@@ -1162,7 +1162,7 @@ namespace OpenSim.Region.Framework.Scenes
1162 } 1162 }
1163 } 1163 }
1164 1164
1165 //Console.WriteLine("AFTER CROSS"); 1165 //m_log.Debug("AFTER CROSS");
1166 //Scene.DumpChildrenSeeds(UUID); 1166 //Scene.DumpChildrenSeeds(UUID);
1167 //DumpKnownRegions(); 1167 //DumpKnownRegions();
1168 return agent; 1168 return agent;
@@ -1252,14 +1252,14 @@ namespace OpenSim.Region.Framework.Scenes
1252 1252
1253// private void Dump(string msg, List<ulong> handles) 1253// private void Dump(string msg, List<ulong> handles)
1254// { 1254// {
1255// Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg); 1255// m_log.Info"-------------- HANDLE DUMP ({0}) ---------", msg);
1256// foreach (ulong handle in handles) 1256// foreach (ulong handle in handles)
1257// { 1257// {
1258// uint x, y; 1258// uint x, y;
1259// Utils.LongToUInts(handle, out x, out y); 1259// Utils.LongToUInts(handle, out x, out y);
1260// x = x / Constants.RegionSize; 1260// x = x / Constants.RegionSize;
1261// y = y / Constants.RegionSize; 1261// y = y / Constants.RegionSize;
1262// Console.WriteLine("({0}, {1})", x, y); 1262// m_log.Info("({0}, {1})", x, y);
1263// } 1263// }
1264// } 1264// }
1265 } 1265 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 00b49a1..07c77aa 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Region.Framework.Scenes
322 322
323 public bool TrySetCurrentScene(UUID regionID) 323 public bool TrySetCurrentScene(UUID regionID)
324 { 324 {
325 Console.WriteLine("Searching for Region: '{0}'", regionID.ToString()); 325 m_log.Debug("Searching for Region: '" + regionID + "'");
326 326
327 foreach (Scene scene in m_localScenes) 327 foreach (Scene scene in m_localScenes)
328 { 328 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 7d36a63..5c47710 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.Framework.Scenes
309 309
310 public string GetStateSnapshot() 310 public string GetStateSnapshot()
311 { 311 {
312 //Console.WriteLine(" >>> GetStateSnapshot <<<"); 312 //m_log.Debug(" >>> GetStateSnapshot <<<");
313 313
314 List<string> assemblies = new List<string>(); 314 List<string> assemblies = new List<string>();
315 Dictionary<UUID, string> states = new Dictionary<UUID, string>(); 315 Dictionary<UUID, string> states = new Dictionary<UUID, string>();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 69bc554..d1aef1c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -526,7 +526,7 @@ namespace OpenSim.Region.Framework.Scenes
526 } 526 }
527 else 527 else
528 { 528 {
529 Console.WriteLine("found unexpected element: " + reader.Name); 529 m_log.Warn("found unexpected element: " + reader.Name);
530 reader.Read(); 530 reader.Read();
531 } 531 }
532 break; 532 break;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 27c22eb..1470191 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Framework.Scenes
320 320
321 protected SceneObjectPart(SerializationInfo info, StreamingContext context) 321 protected SceneObjectPart(SerializationInfo info, StreamingContext context)
322 { 322 {
323 //System.Console.WriteLine("SceneObjectPart Deserialize BGN"); 323 //m_log.Debug("SceneObjectPart Deserialize BGN");
324 m_TextureAnimation = new byte[0]; 324 m_TextureAnimation = new byte[0];
325 m_particleSystem = new byte[0]; 325 m_particleSystem = new byte[0];
326 if (info == null) 326 if (info == null)
@@ -333,7 +333,7 @@ namespace OpenSim.Region.Framework.Scenes
333 m_ids = (List<UUID>)info.GetValue("m_ids", typeof(List<UUID>)); 333 m_ids = (List<UUID>)info.GetValue("m_ids", typeof(List<UUID>));
334 */ 334 */
335 335
336 //System.Console.WriteLine("SceneObjectPart Deserialize END"); 336 //m_log.Debug("SceneObjectPart Deserialize END");
337 Rezzed = DateTime.Now; 337 Rezzed = DateTime.Now;
338 338
339 m_inventory = new SceneObjectPartInventory(this); 339 m_inventory = new SceneObjectPartInventory(this);
@@ -534,7 +534,7 @@ namespace OpenSim.Region.Framework.Scenes
534 } 534 }
535 catch (Exception e) 535 catch (Exception e)
536 { 536 {
537 Console.WriteLine("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message); 537 m_log.Error("[SCENEOBJECTPART]: GROUP POSITION. " + e.Message);
538 } 538 }
539 } 539 }
540 540
@@ -619,7 +619,7 @@ namespace OpenSim.Region.Framework.Scenes
619 } 619 }
620 catch (Exception ex) 620 catch (Exception ex)
621 { 621 {
622 Console.WriteLine("[SCENEOBJECTPART]: ROTATIONOFFSET" + ex.Message); 622 m_log.Error("[SCENEOBJECTPART]: ROTATIONOFFSET" + ex.Message);
623 } 623 }
624 } 624 }
625 625
@@ -1121,13 +1121,13 @@ if (m_shape != null) {
1121 // PrimFlags prevflag = Flags; 1121 // PrimFlags prevflag = Flags;
1122 if ((ObjectFlags & (uint) flag) == 0) 1122 if ((ObjectFlags & (uint) flag) == 0)
1123 { 1123 {
1124 //Console.WriteLine("Adding flag: " + ((PrimFlags) flag).ToString()); 1124 //m_log.Debug("Adding flag: " + ((PrimFlags) flag).ToString());
1125 _flags |= flag; 1125 _flags |= flag;
1126 1126
1127 if (flag == PrimFlags.TemporaryOnRez) 1127 if (flag == PrimFlags.TemporaryOnRez)
1128 ResetExpire(); 1128 ResetExpire();
1129 } 1129 }
1130 // System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); 1130 // m_log.Debug("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString());
1131 } 1131 }
1132 1132
1133 /// <summary> 1133 /// <summary>
@@ -2197,10 +2197,10 @@ if (m_shape != null) {
2197 // PrimFlags prevflag = Flags; 2197 // PrimFlags prevflag = Flags;
2198 if ((ObjectFlags & (uint) flag) != 0) 2198 if ((ObjectFlags & (uint) flag) != 0)
2199 { 2199 {
2200 //Console.WriteLine("Removing flag: " + ((PrimFlags)flag).ToString()); 2200 //m_log.Debug("Removing flag: " + ((PrimFlags)flag).ToString());
2201 _flags &= ~flag; 2201 _flags &= ~flag;
2202 } 2202 }
2203 //System.Console.WriteLine("prev: " + prevflag.ToString() + " curr: " + Flags.ToString()); 2203 //m_log.Debug("prev: " + prevflag.ToString() + " curr: " + Flags.ToString());
2204 //ScheduleFullUpdate(); 2204 //ScheduleFullUpdate();
2205 } 2205 }
2206 2206
@@ -3552,7 +3552,7 @@ if (m_shape != null) {
3552 { 3552 {
3553 RemFlag(PrimFlags.TemporaryOnRez); 3553 RemFlag(PrimFlags.TemporaryOnRez);
3554 } 3554 }
3555 // System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString()); 3555 // m_log.Debug("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
3556 3556
3557 ParentGroup.HasGroupChanged = true; 3557 ParentGroup.HasGroupChanged = true;
3558 ScheduleFullUpdate(); 3558 ScheduleFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index c625a72..9666525 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -666,7 +666,7 @@ namespace OpenSim.Region.Framework.Scenes
666 666
667 fileData = Utils.StringToBytes(invString.BuildString); 667 fileData = Utils.StringToBytes(invString.BuildString);
668 668
669 //Console.WriteLine(Utils.BytesToString(fileData)); 669 //m_log.Debug(Utils.BytesToString(fileData));
670 //m_log.Debug("[PRIM INVENTORY]: RequestInventoryFile fileData: " + Utils.BytesToString(fileData)); 670 //m_log.Debug("[PRIM INVENTORY]: RequestInventoryFile fileData: " + Utils.BytesToString(fileData));
671 671
672 if (fileData.Length > 2) 672 if (fileData.Length > 2)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 429b615..dd8c719 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Framework.Scenes
71 { 71 {
72// ~ScenePresence() 72// ~ScenePresence()
73// { 73// {
74// System.Console.WriteLine("[ScenePresence] Destructor called"); 74// m_log.Debug("[ScenePresence] Destructor called");
75// } 75// }
76 76
77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -409,7 +409,7 @@ namespace OpenSim.Region.Framework.Scenes
409 } 409 }
410 catch (Exception e) 410 catch (Exception e)
411 { 411 {
412 Console.WriteLine("[SCENEPRESENCE]: ABSOLUTE POSITION " + e.Message); 412 m_log.Error("[SCENEPRESENCE]: ABSOLUTE POSITION " + e.Message);
413 } 413 }
414 } 414 }
415 415
@@ -449,7 +449,7 @@ namespace OpenSim.Region.Framework.Scenes
449 } 449 }
450 catch (Exception e) 450 catch (Exception e)
451 { 451 {
452 Console.WriteLine("[SCENEPRESENCE]: VELOCITY " + e.Message); 452 m_log.Error("[SCENEPRESENCE]: VELOCITY " + e.Message);
453 } 453 }
454 } 454 }
455 455
@@ -525,20 +525,20 @@ namespace OpenSim.Region.Framework.Scenes
525 DropOldNeighbours(old); 525 DropOldNeighbours(old);
526 Scene.CapsModule.SetChildrenSeed(UUID, seeds); 526 Scene.CapsModule.SetChildrenSeed(UUID, seeds);
527 KnownRegions = seeds; 527 KnownRegions = seeds;
528 //Console.WriteLine(" ++++++++++AFTER+++++++++++++ "); 528 //m_log.Debug(" ++++++++++AFTER+++++++++++++ ");
529 //DumpKnownRegions(); 529 //DumpKnownRegions();
530 } 530 }
531 531
532 public void DumpKnownRegions() 532 public void DumpKnownRegions()
533 { 533 {
534 Console.WriteLine("================ KnownRegions {0} ================", Scene.RegionInfo.RegionName); 534 m_log.Info("================ KnownRegions "+Scene.RegionInfo.RegionName+" ================");
535 foreach (KeyValuePair<ulong, string> kvp in KnownRegions) 535 foreach (KeyValuePair<ulong, string> kvp in KnownRegions)
536 { 536 {
537 uint x, y; 537 uint x, y;
538 Utils.LongToUInts(kvp.Key, out x, out y); 538 Utils.LongToUInts(kvp.Key, out x, out y);
539 x = x / Constants.RegionSize; 539 x = x / Constants.RegionSize;
540 y = y / Constants.RegionSize; 540 y = y / Constants.RegionSize;
541 Console.WriteLine(" >> {0}, {1}: {2}", x, y, kvp.Value); 541 m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
542 } 542 }
543 } 543 }
544 544
@@ -991,7 +991,7 @@ namespace OpenSim.Region.Framework.Scenes
991 if (m_knownChildRegions.ContainsKey(regionHandle)) 991 if (m_knownChildRegions.ContainsKey(regionHandle))
992 { 992 {
993 m_knownChildRegions.Remove(regionHandle); 993 m_knownChildRegions.Remove(regionHandle);
994 //Console.WriteLine(" !!! removing known region {0} in {1}. Count = {2}", regionHandle, Scene.RegionInfo.RegionName, m_knownChildRegions.Count); 994 //m_log.Debug(" !!! removing known region {0} in {1}. Count = {2}", regionHandle, Scene.RegionInfo.RegionName, m_knownChildRegions.Count);
995 } 995 }
996 } 996 }
997 } 997 }
@@ -1066,7 +1066,7 @@ namespace OpenSim.Region.Framework.Scenes
1066 { 1066 {
1067 //if (m_isChildAgent) 1067 //if (m_isChildAgent)
1068 //{ 1068 //{
1069 // // Console.WriteLine("DEBUG: HandleAgentUpdate: child agent"); 1069 // // m_log.Debug("DEBUG: HandleAgentUpdate: child agent");
1070 // return; 1070 // return;
1071 //} 1071 //}
1072 1072
@@ -1406,7 +1406,7 @@ namespace OpenSim.Region.Framework.Scenes
1406 catch (Exception ex) 1406 catch (Exception ex)
1407 { 1407 {
1408 //Why did I get this error? 1408 //Why did I get this error?
1409 Console.WriteLine("[SCENEPRESENCE]: DoMoveToPosition" + ex.ToString()); 1409 m_log.Error("[SCENEPRESENCE]: DoMoveToPosition" + ex.ToString());
1410 } 1410 }
1411 } 1411 }
1412 1412
@@ -1923,7 +1923,7 @@ namespace OpenSim.Region.Framework.Scenes
1923 { 1923 {
1924 if (m_isChildAgent) 1924 if (m_isChildAgent)
1925 { 1925 {
1926 Console.WriteLine("DEBUG: AddNewMovement: child agent"); 1926 m_log.Debug("DEBUG: AddNewMovement: child agent");
1927 return; 1927 return;
1928 } 1928 }
1929 1929
@@ -2507,8 +2507,8 @@ namespace OpenSim.Region.Framework.Scenes
2507 x = x / Constants.RegionSize; 2507 x = x / Constants.RegionSize;
2508 y = y / Constants.RegionSize; 2508 y = y / Constants.RegionSize;
2509 2509
2510 //Console.WriteLine("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX))); 2510 //m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX)));
2511 //Console.WriteLine("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY))); 2511 //m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY)));
2512 if (Util.IsOutsideView(x, newRegionX, y, newRegionY)) 2512 if (Util.IsOutsideView(x, newRegionX, y, newRegionY))
2513 { 2513 {
2514 byebyeRegions.Add(handle); 2514 byebyeRegions.Add(handle);
@@ -2561,7 +2561,7 @@ namespace OpenSim.Region.Framework.Scenes
2561 2561
2562 public void ChildAgentDataUpdate(AgentData cAgentData) 2562 public void ChildAgentDataUpdate(AgentData cAgentData)
2563 { 2563 {
2564 //Console.WriteLine(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); 2564 //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName);
2565 if (!IsChildAgent) 2565 if (!IsChildAgent)
2566 return; 2566 return;
2567 2567
@@ -2577,7 +2577,7 @@ namespace OpenSim.Region.Framework.Scenes
2577 if (!IsChildAgent) 2577 if (!IsChildAgent)
2578 return; 2578 return;
2579 2579
2580 //Console.WriteLine(" >>> ChildAgentPositionUpdate <<< " + rRegionX + "-" + rRegionY); 2580 //m_log.Debug(" >>> ChildAgentPositionUpdate <<< " + rRegionX + "-" + rRegionY);
2581 int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize; 2581 int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize;
2582 int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize; 2582 int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize;
2583 2583
@@ -2816,7 +2816,7 @@ namespace OpenSim.Region.Framework.Scenes
2816 2816
2817 protected ScenePartUpdate(SerializationInfo info, StreamingContext context) 2817 protected ScenePartUpdate(SerializationInfo info, StreamingContext context)
2818 { 2818 {
2819 //System.Console.WriteLine("ScenePartUpdate Deserialize BGN"); 2819 //m_log.Debug("ScenePartUpdate Deserialize BGN");
2820 2820
2821 if (info == null) 2821 if (info == null)
2822 { 2822 {
@@ -2827,7 +2827,7 @@ namespace OpenSim.Region.Framework.Scenes
2827 LastFullUpdateTime = (uint)info.GetValue("LastFullUpdateTime", typeof(uint)); 2827 LastFullUpdateTime = (uint)info.GetValue("LastFullUpdateTime", typeof(uint));
2828 LastTerseUpdateTime = (uint)info.GetValue("LastTerseUpdateTime", typeof(uint)); 2828 LastTerseUpdateTime = (uint)info.GetValue("LastTerseUpdateTime", typeof(uint));
2829 2829
2830 //System.Console.WriteLine("ScenePartUpdate Deserialize END"); 2830 //m_log.Debug("ScenePartUpdate Deserialize END");
2831 } 2831 }
2832 2832
2833 [SecurityPermission(SecurityAction.LinkDemand, 2833 [SecurityPermission(SecurityAction.LinkDemand,
@@ -3084,7 +3084,7 @@ namespace OpenSim.Region.Framework.Scenes
3084 protected ScenePresence(SerializationInfo info, StreamingContext context) 3084 protected ScenePresence(SerializationInfo info, StreamingContext context)
3085 : base (info, context) 3085 : base (info, context)
3086 { 3086 {
3087 //System.Console.WriteLine("ScenePresence Deserialize BGN"); 3087 //m_log.Debug("ScenePresence Deserialize BGN");
3088 3088
3089 if (info == null) 3089 if (info == null)
3090 { 3090 {
@@ -3239,7 +3239,7 @@ namespace OpenSim.Region.Framework.Scenes
3239 3239
3240 m_state = (byte)info.GetValue("m_state", typeof(byte)); 3240 m_state = (byte)info.GetValue("m_state", typeof(byte));
3241 3241
3242 //System.Console.WriteLine("ScenePresence Deserialize END"); 3242 //m_log.Debug("ScenePresence Deserialize END");
3243 } 3243 }
3244 3244
3245 [SecurityPermission(SecurityAction.LinkDemand, 3245 [SecurityPermission(SecurityAction.LinkDemand,
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
index fd7ff96..93bbf32 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
@@ -27,11 +27,15 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using log4net;
31using System.Reflection;
30 32
31namespace OpenSim.Region.Framework.Scenes.Scripting 33namespace OpenSim.Region.Framework.Scenes.Scripting
32{ 34{
33 public class NullScriptHost : IScriptHost 35 public class NullScriptHost : IScriptHost
34 { 36 {
37 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38
35 private Vector3 m_pos = new Vector3(128, 128, 30); 39 private Vector3 m_pos = new Vector3(128, 128, 30);
36 40
37 public string Name 41 public string Name
@@ -80,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
80 84
81 public void SetText(string text, Vector3 color, double alpha) 85 public void SetText(string text, Vector3 color, double alpha)
82 { 86 {
83 Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); 87 m_log.Warn("Tried to SetText "+text+" on NullScriptHost");
84 } 88 }
85 } 89 }
86} 90}
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
index 58228cc..79ffe44 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Scripting/ScriptEngineLoader.cs
@@ -87,10 +87,10 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
87 //} 87 //}
88 88
89 89
90 //Console.WriteLine("Loading: " + FileName); 90 //m_log.Debug("Loading: " + FileName);
91 //foreach (Type _t in a.GetTypes()) 91 //foreach (Type _t in a.GetTypes())
92 //{ 92 //{
93 // Console.WriteLine("Type: " + _t.ToString()); 93 // m_log.Debug("Type: " + _t.ToString());
94 //} 94 //}
95 95
96 Type t; 96 Type t;
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index b2cea5d..039e9a7 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
144 SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); 144 SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
145 145
146 // Know what's not thread safe in Mono... modifying timers. 146 // Know what's not thread safe in Mono... modifying timers.
147 // System.Console.WriteLine("Firing Stats Heart Beat"); 147 // m_log.Debug("Firing Stats Heart Beat");
148 lock (m_report) 148 lock (m_report)
149 { 149 {
150 uint regionFlags = 0; 150 uint regionFlags = 0;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 096b2cb..c984c7d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
55 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); 55 SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
56 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); 56 SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
57 57
58 //System.Console.WriteLine("retrievedPart : {0}", retrievedPart); 58 //m_log.Debug("retrievedPart : {0}", retrievedPart);
59 // If the parts have the same UUID then we will consider them as one and the same 59 // If the parts have the same UUID then we will consider them as one and the same
60 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); 60 Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
61 } 61 }
@@ -136,4 +136,4 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
136 Assert.That(retrievedPart, Is.Null); 136 Assert.That(retrievedPart, Is.Null);
137 } 137 }
138 } 138 }
139} \ No newline at end of file 139}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 3e0f48f..b5dbb38 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -36,6 +36,8 @@ using OpenSim.Region.Communications.Local;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Tests.Common.Mock; 37using OpenSim.Tests.Common.Mock;
38using OpenSim.Tests.Common.Setup; 38using OpenSim.Tests.Common.Setup;
39using log4net;
40using System.Reflection;
39 41
40namespace OpenSim.Region.CoreModules.Scenes.Tests 42namespace OpenSim.Region.CoreModules.Scenes.Tests
41{ 43{
@@ -45,6 +47,8 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
45 [TestFixture] 47 [TestFixture]
46 public class SceneObjectLinkingTests 48 public class SceneObjectLinkingTests
47 { 49 {
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51
48 [Test] 52 [Test]
49 public void TestLinkDelink2SceneObjects() 53 public void TestLinkDelink2SceneObjects()
50 { 54 {
@@ -80,10 +84,10 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
80 84
81 if (debugtest) 85 if (debugtest)
82 { 86 {
83 System.Console.WriteLine("parts: {0}", grp1.Children.Count); 87 m_log.Debug("parts: " + grp1.Children.Count);
84 System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation); 88 m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
85 System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset); 89 m_log.Debug("Group1: Prim1: OffsetPosition:"+ part1.OffsetPosition+", OffsetRotation:"+part1.RotationOffset);
86 System.Console.WriteLine("Group1: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.OffsetPosition, part2.RotationOffset); 90 m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+part2.RotationOffset);
87 } 91 }
88 92
89 // root part should have no offset position or rotation 93 // root part should have no offset position or rotation
@@ -101,13 +105,13 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
101 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 105 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
102 106
103 if (debugtest) 107 if (debugtest)
104 System.Console.WriteLine(rotEuler1); 108 m_log.Debug(rotEuler1);
105 109
106 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw); 110 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
107 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 111 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
108 112
109 if (debugtest) 113 if (debugtest)
110 System.Console.WriteLine(rotEuler2); 114 m_log.Debug(rotEuler2);
111 115
112 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f)); 116 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
113 117
@@ -115,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
115 grp1.DelinkFromGroup(part2.LocalId); 119 grp1.DelinkFromGroup(part2.LocalId);
116 120
117 if (debugtest) 121 if (debugtest)
118 System.Console.WriteLine("Group2: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset); 122 m_log.Debug("Group2: Prim2: OffsetPosition:" + part2.AbsolutePosition + ", OffsetRotation:" + part2.RotationOffset);
119 123
120 Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink."); 124 Assert.That(grp1.Children.Count, Is.EqualTo(1), "Group 1 still contained part2 after delink.");
121 Assert.That(part2.AbsolutePosition == Vector3.Zero); 125 Assert.That(part2.AbsolutePosition == Vector3.Zero);
@@ -175,16 +179,16 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
175 179
176 if (debugtest) 180 if (debugtest)
177 { 181 {
178 System.Console.WriteLine("--------After Link-------"); 182 m_log.Debug("--------After Link-------");
179 System.Console.WriteLine("Group1: parts: {0}", grp1.Children.Count); 183 m_log.Debug("Group1: parts:" + grp1.Children.Count);
180 System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation); 184 m_log.Debug("Group1: Pos:"+grp1.AbsolutePosition+", Rot:"+grp1.Rotation);
181 System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset); 185 m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
182 System.Console.WriteLine("Group1: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.OffsetPosition, part2.RotationOffset); 186 m_log.Debug("Group1: Prim2: OffsetPosition:"+part2.OffsetPosition+", OffsetRotation:"+ part2.RotationOffset);
183 187
184 System.Console.WriteLine("Group3: parts: {0}", grp3.Children.Count); 188 m_log.Debug("Group3: parts:"+grp3.Children.Count);
185 System.Console.WriteLine("Group3: Pos:{0}, Rot:{1}", grp3.AbsolutePosition, grp3.Rotation); 189 m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation);
186 System.Console.WriteLine("Group3: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part3.OffsetPosition, part3.RotationOffset); 190 m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset);
187 System.Console.WriteLine("Group3: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part4.OffsetPosition, part4.RotationOffset); 191 m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset);
188 } 192 }
189 193
190 // Required for linking 194 // Required for linking
@@ -206,13 +210,13 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
206 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 210 Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
207 211
208 if (debugtest) 212 if (debugtest)
209 System.Console.WriteLine(rotEuler1); 213 m_log.Debug(rotEuler1);
210 214
211 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw); 215 part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
212 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG); 216 Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
213 217
214 if (debugtest) 218 if (debugtest)
215 System.Console.WriteLine(rotEuler2); 219 m_log.Debug(rotEuler2);
216 220
217 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f)); 221 Assert.That(rotEuler2.ApproxEquals(new Vector3(-180, 0, 0), 0.001f) || rotEuler2.ApproxEquals(new Vector3(180, 0, 0), 0.001f));
218 222
@@ -225,16 +229,16 @@ namespace OpenSim.Region.CoreModules.Scenes.Tests
225 229
226 if (debugtest) 230 if (debugtest)
227 { 231 {
228 System.Console.WriteLine("--------After De-Link-------"); 232 m_log.Debug("--------After De-Link-------");
229 System.Console.WriteLine("Group1: parts: {0}", grp1.Children.Count); 233 m_log.Debug("Group1: parts:" + grp1.Children.Count);
230 System.Console.WriteLine("Group1: Pos:{0}, Rot:{1}", grp1.AbsolutePosition, grp1.Rotation); 234 m_log.Debug("Group1: Pos:" + grp1.AbsolutePosition + ", Rot:" + grp1.Rotation);
231 System.Console.WriteLine("Group1: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part1.OffsetPosition, part1.RotationOffset); 235 m_log.Debug("Group1: Prim1: OffsetPosition:" + part1.OffsetPosition + ", OffsetRotation:" + part1.RotationOffset);
232 System.Console.WriteLine("NoGroup: Prim2: AbsolutePosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset); 236 m_log.Debug("Group1: Prim2: OffsetPosition:" + part2.OffsetPosition + ", OffsetRotation:" + part2.RotationOffset);
233 237
234 System.Console.WriteLine("Group3: parts: {0}", grp3.Children.Count); 238 m_log.Debug("Group3: parts:" + grp3.Children.Count);
235 System.Console.WriteLine("Group3: Pos:{0}, Rot:{1}", grp3.AbsolutePosition, grp3.Rotation); 239 m_log.Debug("Group3: Pos:" + grp3.AbsolutePosition + ", Rot:" + grp3.Rotation);
236 System.Console.WriteLine("Group3: Prim1: OffsetPosition:{0}, OffsetRotation:{1}", part3.OffsetPosition, part3.RotationOffset); 240 m_log.Debug("Group3: Prim1: OffsetPosition:" + part3.OffsetPosition + ", OffsetRotation:" + part3.RotationOffset);
237 System.Console.WriteLine("Group3: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part4.OffsetPosition, part4.RotationOffset); 241 m_log.Debug("Group3: Prim2: OffsetPosition:" + part4.OffsetPosition + ", OffsetRotation:" + part4.RotationOffset);
238 } 242 }
239 243
240 Assert.That(part2.AbsolutePosition == Vector3.Zero); 244 Assert.That(part2.AbsolutePosition == Vector3.Zero);
diff --git a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
index 9fbbb15..f23fc06 100644
--- a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
53 m_leftY = leftY; 53 m_leftY = leftY;
54 m_width = width; 54 m_width = width;
55 m_height = height; 55 m_height = height;
56 // Console.WriteLine("creating quadtree node " + m_quadID); 56 // m_log.Debug("creating quadtree node " + m_quadID);
57 } 57 }
58 58
59 public void AddObject(SceneObjectGroup obj) 59 public void AddObject(SceneObjectGroup obj)
diff --git a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 452ada9..2b7611f 100644
--- a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
92 92
93 protected UpdateQueue(SerializationInfo info, StreamingContext context) 93 protected UpdateQueue(SerializationInfo info, StreamingContext context)
94 { 94 {
95 //System.Console.WriteLine("UpdateQueue Deserialize BGN"); 95 //m_log.Debug("UpdateQueue Deserialize BGN");
96 96
97 if (info == null) 97 if (info == null)
98 { 98 {
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
107 m_ids.Add(new UUID(guid)); 107 m_ids.Add(new UUID(guid));
108 } 108 }
109 109
110 //System.Console.WriteLine("UpdateQueue Deserialize END"); 110 //m_log.Debug("UpdateQueue Deserialize END");
111 } 111 }
112 112
113 [SecurityPermission(SecurityAction.LinkDemand, 113 [SecurityPermission(SecurityAction.LinkDemand,
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 72575e5..72dc70f 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -35,6 +35,8 @@ using OpenMetaverse.Imaging;
35using System.Drawing; 35using System.Drawing;
36using System.Drawing.Imaging; 36using System.Drawing.Imaging;
37using PrimMesher; 37using PrimMesher;
38using log4net;
39using System.Reflection;
38 40
39namespace OpenSim.Region.Physics.Meshing 41namespace OpenSim.Region.Physics.Meshing
40{ 42{
@@ -57,6 +59,7 @@ namespace OpenSim.Region.Physics.Meshing
57 59
58 public class Meshmerizer : IMesher 60 public class Meshmerizer : IMesher
59 { 61 {
62 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
60 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 63 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
61 64
62 // Setting baseDir to a path will enable the dumping of raw files 65 // Setting baseDir to a path will enable the dumping of raw files
@@ -155,9 +158,9 @@ namespace OpenSim.Region.Physics.Meshing
155 158
156 private void ReportPrimError(string message, string primName, PrimMesh primMesh) 159 private void ReportPrimError(string message, string primName, PrimMesh primMesh)
157 { 160 {
158 Console.WriteLine(message); 161 m_log.Error(message);
159 Console.WriteLine("\nPrim Name: " + primName); 162 m_log.Error("\nPrim Name: " + primName);
160 Console.WriteLine("****** PrimMesh Parameters ******\n" + primMesh.ParamsToDisplayString()); 163 m_log.Error("****** PrimMesh Parameters ******\n" + primMesh.ParamsToDisplayString());
161 164
162 } 165 }
163 166
@@ -185,17 +188,17 @@ namespace OpenSim.Region.Physics.Meshing
185 } 188 }
186 catch (DllNotFoundException) 189 catch (DllNotFoundException)
187 { 190 {
188 System.Console.WriteLine("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed. Often times this is because of an old version of GLIBC. You must have version 2.4 or above!"); 191 m_log.Error("[PHYSICS]: OpenJpeg is not installed correctly on this system. Physics Proxy generation failed. Often times this is because of an old version of GLIBC. You must have version 2.4 or above!");
189 return null; 192 return null;
190 } 193 }
191 catch (IndexOutOfRangeException) 194 catch (IndexOutOfRangeException)
192 { 195 {
193 System.Console.WriteLine("[PHYSICS]: OpenJpeg was unable to decode this. Physics Proxy generation failed"); 196 m_log.Error("[PHYSICS]: OpenJpeg was unable to decode this. Physics Proxy generation failed");
194 return null; 197 return null;
195 } 198 }
196 catch (Exception) 199 catch (Exception)
197 { 200 {
198 System.Console.WriteLine("[PHYSICS]: Unable to generate a Sculpty physics proxy. Sculpty texture decode failed!"); 201 m_log.Error("[PHYSICS]: Unable to generate a Sculpty physics proxy. Sculpty texture decode failed!");
199 return null; 202 return null;
200 } 203 }
201 204
@@ -285,7 +288,7 @@ namespace OpenSim.Region.Physics.Meshing
285 if (profileEnd > 1.0f) profileEnd = 1.0f; 288 if (profileEnd > 1.0f) profileEnd = 1.0f;
286 } 289 }
287#if SPAM 290#if SPAM
288 Console.WriteLine("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString()); 291 m_log.Debug("****** PrimMesh Parameters (Linear) ******\n" + primMesh.ParamsToDisplayString());
289#endif 292#endif
290 try 293 try
291 { 294 {
@@ -316,7 +319,7 @@ namespace OpenSim.Region.Physics.Meshing
316 if (profileEnd > 1.0f) profileEnd = 1.0f; 319 if (profileEnd > 1.0f) profileEnd = 1.0f;
317 } 320 }
318#if SPAM 321#if SPAM
319 Console.WriteLine("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString()); 322 m_log.Debug("****** PrimMesh Parameters (Circular) ******\n" + primMesh.ParamsToDisplayString());
320#endif 323#endif
321 try 324 try
322 { 325 {
@@ -378,7 +381,7 @@ namespace OpenSim.Region.Physics.Meshing
378 if ((!isPhysical) && size.X < minSizeForComplexMesh && size.Y < minSizeForComplexMesh && size.Z < minSizeForComplexMesh) 381 if ((!isPhysical) && size.X < minSizeForComplexMesh && size.Y < minSizeForComplexMesh && size.Z < minSizeForComplexMesh)
379 { 382 {
380#if SPAM 383#if SPAM
381 Console.WriteLine("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + 384 m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " +
382 385
383minSizeForComplexMesh.ToString() + " - creating simple bounding box" ); 386minSizeForComplexMesh.ToString() + " - creating simple bounding box" );
384#endif 387#endif
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index c28577d..86c9c08 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -29,6 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using System.IO; 31using System.IO;
32using log4net;
33using System.Reflection;
32 34
33namespace PrimMesher 35namespace PrimMesher
34{ 36{
@@ -576,6 +578,7 @@ namespace PrimMesher
576 /// </summary> 578 /// </summary>
577 internal class Profile 579 internal class Profile
578 { 580 {
581 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
579 private const float twoPi = 2.0f * (float)Math.PI; 582 private const float twoPi = 2.0f * (float)Math.PI;
580 583
581 internal List<Coord> coords; 584 internal List<Coord> coords;
@@ -643,8 +646,8 @@ namespace PrimMesher
643 try { angles.makeAngles(sides, startAngle, stopAngle); } 646 try { angles.makeAngles(sides, startAngle, stopAngle); }
644 catch (Exception ex) 647 catch (Exception ex)
645 { 648 {
646 Console.WriteLine("makeAngles failed: Exception: " + ex.ToString()); 649 m_log.Error("makeAngles failed: Exception: " + ex.ToString());
647 Console.WriteLine("sides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString()); 650 m_log.Error("sides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString());
648 return; 651 return;
649 } 652 }
650 653
@@ -663,8 +666,8 @@ namespace PrimMesher
663 try { hollowAngles.makeAngles(hollowSides, startAngle, stopAngle); } 666 try { hollowAngles.makeAngles(hollowSides, startAngle, stopAngle); }
664 catch (Exception ex) 667 catch (Exception ex)
665 { 668 {
666 Console.WriteLine("makeAngles failed: Exception: " + ex.ToString()); 669 m_log.Error("makeAngles failed: Exception: " + ex.ToString());
667 Console.WriteLine("sides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString()); 670 m_log.Error("sides: " + sides.ToString() + " startAngle: " + startAngle.ToString() + " stopAngle: " + stopAngle.ToString());
668 return; 671 return;
669 } 672 }
670 } 673 }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 16e0efe..9991ab1 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Physics.OdePlugin
669 m_pidControllerActive = false; 669 m_pidControllerActive = false;
670 force *= 100f; 670 force *= 100f;
671 doForce(force); 671 doForce(force);
672 //System.Console.WriteLine("Push!"); 672 //m_log.Debug("Push!");
673 //_target_velocity.X += force.X; 673 //_target_velocity.X += force.X;
674 // _target_velocity.Y += force.Y; 674 // _target_velocity.Y += force.Y;
675 //_target_velocity.Z += force.Z; 675 //_target_velocity.Z += force.Z;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index bfb9b1a..6d07b92 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2507,7 +2507,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2507 } 2507 }
2508 else 2508 else
2509 { 2509 {
2510 //System.Console.WriteLine(Math.Abs(m_lastposition.X - l_position.X).ToString()); 2510 //m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString());
2511 _zeroFlag = false; 2511 _zeroFlag = false;
2512 } 2512 }
2513 2513
@@ -2569,7 +2569,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2569 m_rotationalVelocity.setValues(rotvel.X, rotvel.Y, rotvel.Z); 2569 m_rotationalVelocity.setValues(rotvel.X, rotvel.Y, rotvel.Z);
2570 } 2570 }
2571 2571
2572 //System.Console.WriteLine("ODE: " + m_rotationalVelocity.ToString()); 2572 //m_log.Debug("ODE: " + m_rotationalVelocity.ToString());
2573 _orientation.X = ori.X; 2573 _orientation.X = ori.X;
2574 _orientation.Y = ori.Y; 2574 _orientation.Y = ori.Y;
2575 _orientation.Z = ori.Z; 2575 _orientation.Z = ori.Z;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
index c913639..6ee23db 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODETestClass.cs
@@ -31,12 +31,16 @@ using NUnit.Framework;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Physics.Manager; 33using OpenSim.Region.Physics.Manager;
34using log4net;
35using System.Reflection;
34 36
35namespace OpenSim.Region.Physics.OdePlugin 37namespace OpenSim.Region.Physics.OdePlugin
36{ 38{
37 [TestFixture] 39 [TestFixture]
38 public class ODETestClass 40 public class ODETestClass
39 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
40 private OdePlugin cbt; 44 private OdePlugin cbt;
41 private PhysicsScene ps; 45 private PhysicsScene ps;
42 private IMeshingPlugin imp; 46 private IMeshingPlugin imp;
@@ -92,18 +96,18 @@ namespace OpenSim.Region.Physics.OdePlugin
92 Assert.That(oprim.m_targetSpace != (IntPtr)0); 96 Assert.That(oprim.m_targetSpace != (IntPtr)0);
93 97
94 //Assert.That(oprim.m_targetSpace == pscene.space); 98 //Assert.That(oprim.m_targetSpace == pscene.space);
95 Console.WriteLine("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space); 99 m_log.Info("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space);
96 100
97 Assert.That(!oprim.m_taintadd); 101 Assert.That(!oprim.m_taintadd);
98 Console.WriteLine("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString()); 102 m_log.Info("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString());
99 103
100 // Make sure we're above the ground 104 // Make sure we're above the ground
101 //Assert.That(prim.Position.Z > 20f); 105 //Assert.That(prim.Position.Z > 20f);
102 //Console.WriteLine("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore); 106 //m_log.Info("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore);
103 107
104 // Make sure we've got a Body 108 // Make sure we've got a Body
105 Assert.That(oprim.Body != (IntPtr)0); 109 Assert.That(oprim.Body != (IntPtr)0);
106 //Console.WriteLine( 110 //m_log.Info(
107 } 111 }
108 112
109 // Make sure we're not somewhere above the ground 113 // Make sure we're not somewhere above the ground
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index f30de4d..359e7b3 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Physics.OdePlugin
579 //if (id == d.GeomClassId.TriMeshClass) 579 //if (id == d.GeomClassId.TriMeshClass)
580 //{ 580 //{
581 // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2); 581 // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2);
582 //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); 582 //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
583 //} 583 //}
584 584
585 // Figure out how many contact points we have 585 // Figure out how many contact points we have
@@ -945,8 +945,8 @@ namespace OpenSim.Region.Physics.OdePlugin
945 // so lets throttle them and send them again after it's somewhat sorted out. 945 // so lets throttle them and send them again after it's somewhat sorted out.
946 p2.ThrottleUpdates = true; 946 p2.ThrottleUpdates = true;
947 } 947 }
948 //System.Console.WriteLine(count.ToString()); 948 //m_log.Debug(count.ToString());
949 //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); 949 //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
950 } 950 }
951 } 951 }
952 952
@@ -2095,7 +2095,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2095 // convenient place to do it for now... 2095 // convenient place to do it for now...
2096 2096
2097 // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f) 2097 // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f)
2098 // //Console.WriteLine("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString()); 2098 // //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString());
2099 int iPropertiesNotSupportedDefault = 0; 2099 int iPropertiesNotSupportedDefault = 0;
2100 2100
2101 if (pbs.SculptEntry && !meshSculptedPrim) 2101 if (pbs.SculptEntry && !meshSculptedPrim)
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
index 18935fb..5579848 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
@@ -32,6 +32,8 @@ using OpenSim.Framework;
32using OpenSim.Region.Physics.Manager; 32using OpenSim.Region.Physics.Manager;
33using PhysXWrapper; 33using PhysXWrapper;
34using Quaternion=OpenMetaverse.Quaternion; 34using Quaternion=OpenMetaverse.Quaternion;
35using System.Reflection;
36using log4net;
35 37
36namespace OpenSim.Region.Physics.PhysXPlugin 38namespace OpenSim.Region.Physics.PhysXPlugin
37{ 39{
@@ -40,6 +42,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
40 /// </summary> 42 /// </summary>
41 public class PhysXPlugin : IPhysicsPlugin 43 public class PhysXPlugin : IPhysicsPlugin
42 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 private PhysXScene _mScene; 46 private PhysXScene _mScene;
44 47
45 public PhysXPlugin() 48 public PhysXPlugin()
@@ -72,6 +75,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
72 75
73 public class PhysXScene : PhysicsScene 76 public class PhysXScene : PhysicsScene
74 { 77 {
78 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
75 private List<PhysXCharacter> _characters = new List<PhysXCharacter>(); 79 private List<PhysXCharacter> _characters = new List<PhysXCharacter>();
76 private List<PhysXPrim> _prims = new List<PhysXPrim>(); 80 private List<PhysXPrim> _prims = new List<PhysXPrim>();
77 private float[] _heightMap = null; 81 private float[] _heightMap = null;
@@ -84,7 +88,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
84 //sceneIdentifier = _sceneIdentifier; 88 //sceneIdentifier = _sceneIdentifier;
85 89
86 mySdk = NxPhysicsSDK.CreateSDK(); 90 mySdk = NxPhysicsSDK.CreateSDK();
87 Console.WriteLine("Sdk created - now creating scene"); 91 m_log.Info("Sdk created - now creating scene");
88 scene = mySdk.CreateScene(); 92 scene = mySdk.CreateScene();
89 } 93 }
90 94
@@ -174,7 +178,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
174 } 178 }
175 catch (Exception e) 179 catch (Exception e)
176 { 180 {
177 Console.WriteLine(e.Message); 181 m_log.Error(e.Message);
178 } 182 }
179 return fps; 183 return fps;
180 } 184 }
@@ -193,7 +197,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin
193 { 197 {
194 if (_heightMap != null) 198 if (_heightMap != null)
195 { 199 {
196 Console.WriteLine("PhysX - deleting old terrain"); 200 m_log.Debug("PhysX - deleting old terrain");
197 scene.DeleteTerrain(); 201 scene.DeleteTerrain();
198 } 202 }
199 _heightMap = heightMap; 203 _heightMap = heightMap;
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 31c0d4d..2ebc8b7 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
314 // Do we have any scripts in this object at all? If not, return 314 // Do we have any scripts in this object at all? If not, return
315 if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) 315 if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false)
316 { 316 {
317 //Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); 317 //m_log.Debug("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID.");
318 return false; 318 return false;
319 } 319 }
320 320
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs
index c157509..d1d9027 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/MaintenanceThread.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
181 if (DateTime.Now.Ticks - Last_ReReadConfigFilens > 181 if (DateTime.Now.Ticks - Last_ReReadConfigFilens >
182 m_ScriptEngine.RefreshConfigFilens) 182 m_ScriptEngine.RefreshConfigFilens)
183 { 183 {
184 //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens); 184 //m_log.Debug("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens);
185 // Its time to re-read config file 185 // Its time to re-read config file
186 m_ScriptEngine.ReadConfig(); 186 m_ScriptEngine.ReadConfig();
187 Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time 187 Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index c1902ba..bdf80c6 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -45,9 +45,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
45 [Serializable] 45 [Serializable]
46 public class ScriptEngine : IRegionModule, IScriptEngine, IScriptModule 46 public class ScriptEngine : IRegionModule, IScriptEngine, IScriptModule
47 { 47 {
48 private static readonly ILog m_log = 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 LogManager.GetLogger(
50 MethodBase.GetCurrentMethod().DeclaringType);
51 49
52 public static List<ScriptEngine> ScriptEngines = 50 public static List<ScriptEngine> ScriptEngines =
53 new List<ScriptEngine>(); 51 new List<ScriptEngine>();
@@ -265,7 +263,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
265 } 263 }
266 catch (AppDomainUnloadedException) 264 catch (AppDomainUnloadedException)
267 { 265 {
268 Console.WriteLine("[SCRIPT]: state change called when "+ 266 m_log.Error("[SCRIPT]: state change called when "+
269 "script was unloaded. Nothing to worry about, "+ 267 "script was unloaded. Nothing to worry about, "+
270 "but noting the occurance"); 268 "but noting the occurance");
271 } 269 }
@@ -285,7 +283,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
285 } 283 }
286 catch (AppDomainUnloadedException) 284 catch (AppDomainUnloadedException)
287 { 285 {
288 Console.WriteLine("[SCRIPT]: state change called when "+ 286 m_log.Error("[SCRIPT]: state change called when "+
289 "script was unloaded. Nothing to worry about, but "+ 287 "script was unloaded. Nothing to worry about, but "+
290 "noting the occurance"); 288 "noting the occurance");
291 } 289 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5455b53..bc113db 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -58,6 +58,7 @@ using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
58using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; 58using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
59using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; 59using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
60using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; 60using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
61using System.Reflection;
61 62
62namespace OpenSim.Region.ScriptEngine.Shared.Api 63namespace OpenSim.Region.ScriptEngine.Shared.Api
63{ 64{
@@ -66,6 +67,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
66 /// </summary> 67 /// </summary>
67 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 68 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
68 { 69 {
70 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
69 protected IScriptEngine m_ScriptEngine; 71 protected IScriptEngine m_ScriptEngine;
70 protected SceneObjectPart m_host; 72 protected SceneObjectPart m_host;
71 protected uint m_localID; 73 protected uint m_localID;
@@ -1135,7 +1137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1135 public LSL_Integer llGetStatus(int status) 1137 public LSL_Integer llGetStatus(int status)
1136 { 1138 {
1137 m_host.AddScriptLPS(1); 1139 m_host.AddScriptLPS(1);
1138 // Console.WriteLine(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString()); 1140 // m_log.Debug(m_host.ToString() + " status is " + m_host.GetEffectiveObjectFlags().ToString());
1139 switch (status) 1141 switch (status)
1140 { 1142 {
1141 case ScriptBaseClass.STATUS_PHYSICS: 1143 case ScriptBaseClass.STATUS_PHYSICS:
@@ -2706,8 +2708,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2706 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 2708 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
2707 msg.toAgentID = new Guid(user); // toAgentID.Guid; 2709 msg.toAgentID = new Guid(user); // toAgentID.Guid;
2708 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here 2710 msg.imSessionID = new Guid(friendTransactionID.ToString()); // This is the item we're mucking with here
2709// Console.WriteLine("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message); 2711// m_log.Debug("[Scripting IM]: From:" + msg.fromAgentID.ToString() + " To: " + msg.toAgentID.ToString() + " Session:" + msg.imSessionID.ToString() + " Message:" + message);
2710// Console.WriteLine("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString()); 2712// m_log.Debug("[Scripting IM]: Filling Session: " + msg.imSessionID.ToString());
2711 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp; 2713 msg.timestamp = (uint)Util.UnixTimeSinceEpoch();// timestamp;
2712 //if (client != null) 2714 //if (client != null)
2713 //{ 2715 //{
@@ -7882,7 +7884,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7882 } 7884 }
7883 catch(Exception e) 7885 catch(Exception e)
7884 { 7886 {
7885 Console.WriteLine("[LSL_API]: llRequestSimulatorData" + e.ToString()); 7887 m_log.Error("[LSL_API]: llRequestSimulatorData" + e.ToString());
7886 return UUID.Zero.ToString(); 7888 return UUID.Zero.ToString();
7887 } 7889 }
7888 } 7890 }
@@ -9068,7 +9070,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9068 System.Text.ASCIIEncoding enc = 9070 System.Text.ASCIIEncoding enc =
9069 new System.Text.ASCIIEncoding(); 9071 new System.Text.ASCIIEncoding();
9070 string data = enc.GetString(a.Data); 9072 string data = enc.GetString(a.Data);
9071 //Console.WriteLine(data); 9073 //m_log.Debug(data);
9072 NotecardCache.Cache(id, data); 9074 NotecardCache.Cache(id, data);
9073 AsyncCommands. 9075 AsyncCommands.
9074 DataserverPlugin.DataserverReply(id.ToString(), 9076 DataserverPlugin.DataserverReply(id.ToString(),
@@ -9114,7 +9116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9114 System.Text.ASCIIEncoding enc = 9116 System.Text.ASCIIEncoding enc =
9115 new System.Text.ASCIIEncoding(); 9117 new System.Text.ASCIIEncoding();
9116 string data = enc.GetString(a.Data); 9118 string data = enc.GetString(a.Data);
9117 //Console.WriteLine(data); 9119 //m_log.Debug(data);
9118 NotecardCache.Cache(id, data); 9120 NotecardCache.Cache(id, data);
9119 AsyncCommands. 9121 AsyncCommands.
9120 DataserverPlugin.DataserverReply(id.ToString(), 9122 DataserverPlugin.DataserverReply(id.ToString(),
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 597592d..7834a83 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -842,7 +842,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
842 for (i=0;i<JSON.Length; i++) 842 for (i=0;i<JSON.Length; i++)
843 { 843 {
844 844
845 // Console.WriteLine(""+JSON[i]); 845 // m_log.Debug(""+JSON[i]);
846 switch (JSON[i]) 846 switch (JSON[i])
847 { 847 {
848 case '{': 848 case '{':
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
index 0654c07..2ed9295 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
58 58
59 while (httpInfo != null) 59 while (httpInfo != null)
60 { 60 {
61 //System.Console.WriteLine("[AsyncLSL]:" + httpInfo.response_body + httpInfo.status); 61 //m_log.Debug("[AsyncLSL]:" + httpInfo.response_body + httpInfo.status);
62 62
63 // Deliver data to prim's remote_data handler 63 // Deliver data to prim's remote_data handler
64 // 64 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index 91cef9b..d08790c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
108 // Time has passed? 108 // Time has passed?
109 if (ts.next < DateTime.Now.Ticks) 109 if (ts.next < DateTime.Now.Ticks)
110 { 110 {
111 //Console.WriteLine("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 111 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
112 // Add it to queue 112 // Add it to queue
113 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 113 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
114 new EventParams("timer", new Object[0], 114 new EventParams("timer", new Object[0],
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index d76c7c1..3a73674 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -31,11 +31,14 @@ using System.Reflection;
31using System.Runtime.Remoting.Lifetime; 31using System.Runtime.Remoting.Lifetime;
32using OpenSim.Region.ScriptEngine.Shared; 32using OpenSim.Region.ScriptEngine.Shared;
33using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 33using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
34using log4net;
34 35
35namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase 36namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
36{ 37{
37 public class Executor : MarshalByRefObject 38 public class Executor : MarshalByRefObject
38 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41
39 /// <summary> 42 /// <summary>
40 /// Contains the script to execute functions in. 43 /// Contains the script to execute functions in.
41 /// </summary> 44 /// </summary>
@@ -92,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
92 /// <returns></returns> 95 /// <returns></returns>
93 public override Object InitializeLifetimeService() 96 public override Object InitializeLifetimeService()
94 { 97 {
95 //Console.WriteLine("Executor: InitializeLifetimeService()"); 98 //m_log.Debug("Executor: InitializeLifetimeService()");
96 // return null; 99 // return null;
97 ILease lease = (ILease)base.InitializeLifetimeService(); 100 ILease lease = (ILease)base.InitializeLifetimeService();
98 101
@@ -108,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
108 111
109 public scriptEvents GetStateEventFlags(string state) 112 public scriptEvents GetStateEventFlags(string state)
110 { 113 {
111 //Console.WriteLine("Get event flags for " + state); 114 //m_log.Debug("Get event flags for " + state);
112 115
113 // Check to see if we've already computed the flags for this state 116 // Check to see if we've already computed the flags for this state
114 scriptEvents eventFlags = scriptEvents.None; 117 scriptEvents eventFlags = scriptEvents.None;
@@ -124,19 +127,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
124 foreach (KeyValuePair<string, scriptEvents> kvp in m_eventFlagsMap) 127 foreach (KeyValuePair<string, scriptEvents> kvp in m_eventFlagsMap)
125 { 128 {
126 string evname = state + "_event_" + kvp.Key; 129 string evname = state + "_event_" + kvp.Key;
127 //Console.WriteLine("Trying event "+evname); 130 //m_log.Debug("Trying event "+evname);
128 try 131 try
129 { 132 {
130 MethodInfo mi = type.GetMethod(evname); 133 MethodInfo mi = type.GetMethod(evname);
131 if (mi != null) 134 if (mi != null)
132 { 135 {
133 //Console.WriteLine("Found handler for " + kvp.Key); 136 //m_log.Debug("Found handler for " + kvp.Key);
134 eventFlags |= kvp.Value; 137 eventFlags |= kvp.Value;
135 } 138 }
136 } 139 }
137 catch(Exception) 140 catch(Exception)
138 { 141 {
139 //Console.WriteLine("Exeption in GetMethod:\n"+e.ToString()); 142 //m_log.Debug("Exeption in GetMethod:\n"+e.ToString());
140 } 143 }
141 } 144 }
142 145
@@ -144,7 +147,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
144 if (eventFlags != 0) 147 if (eventFlags != 0)
145 m_stateEvents.Add(state, eventFlags); 148 m_stateEvents.Add(state, eventFlags);
146 149
147 //Console.WriteLine("Returning {0:x}", eventFlags); 150 //m_log.Debug("Returning {0:x}", eventFlags);
148 return (eventFlags); 151 return (eventFlags);
149 } 152 }
150 153
@@ -156,7 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
156 string EventName = state + "_event_" + FunctionName; 159 string EventName = state + "_event_" + FunctionName;
157 160
158//#if DEBUG 161//#if DEBUG
159 //Console.WriteLine("ScriptEngine: Script event function name: " + EventName); 162 //m_log.Debug("ScriptEngine: Script event function name: " + EventName);
160//#endif 163//#endif
161 164
162 if (Events.ContainsKey(EventName) == false) 165 if (Events.ContainsKey(EventName) == false)
@@ -170,7 +173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
170 } 173 }
171 catch 174 catch
172 { 175 {
173 Console.WriteLine("Event {0}not found", EventName); 176 m_log.Error("Event "+EventName+" not found.");
174 // Event name not found, cache it as not found 177 // Event name not found, cache it as not found
175 Events.Add(EventName, null); 178 Events.Add(EventName, null);
176 } 179 }
@@ -182,13 +185,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
182 185
183 if (ev == null) // No event by that name! 186 if (ev == null) // No event by that name!
184 { 187 {
185 //Console.WriteLine("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty); 188 //m_log.Debug("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty);
186 return; 189 return;
187 } 190 }
188 191
189//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined 192//cfk 2-7-08 dont need this right now and the default Linux build has DEBUG defined
190#if DEBUG 193#if DEBUG
191 //Console.WriteLine("ScriptEngine: Executing function name: " + EventName); 194 //m_log.Debug("ScriptEngine: Executing function name: " + EventName);
192#endif 195#endif
193 // Found 196 // Found
194 try 197 try
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
index 5a9b0aa..9cdffaa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
@@ -36,6 +36,7 @@ using System.Reflection;
36using System.Net.Sockets; 36using System.Net.Sockets;
37using System.Text; 37using System.Text;
38using System.Text.RegularExpressions; 38using System.Text.RegularExpressions;
39using log4net;
39 40
40namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog 41namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
41{ 42{
@@ -45,6 +46,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
45 /// </summary> 46 /// </summary>
46 public class YP 47 public class YP
47 { 48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 private static Fail _fail = new Fail(); 50 private static Fail _fail = new Fail();
49 private static Repeat _repeat = new Repeat(); 51 private static Repeat _repeat = new Repeat();
50 private static Dictionary<NameArity, List<IClause>> _predicatesStore = 52 private static Dictionary<NameArity, List<IClause>> _predicatesStore =
@@ -2341,7 +2343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
2341 string results = ""; 2343 string results = "";
2342 for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) 2344 for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch())
2343 { 2345 {
2344 //Console.WriteLine( m ); 2346 //m_log.Debug( m );
2345 results += presep+ m + postsep; 2347 results += presep+ m + postsep;
2346 } 2348 }
2347 return results; 2349 return results;
@@ -2359,7 +2361,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
2359 } 2361 }
2360 catch 2362 catch
2361 { 2363 {
2362 Console.WriteLine("Failed to connect to server at {0}:999", "localhost"); 2364 m_log.Error("Failed to connect to server at localhost:999");
2363 return ""; 2365 return "";
2364 } 2366 }
2365 2367
@@ -2379,16 +2381,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
2379 streamWriter.Flush(); 2381 streamWriter.Flush();
2380 2382
2381 cycOutputString = streamReader.ReadLine(); 2383 cycOutputString = streamReader.ReadLine();
2382 Console.WriteLine("Cycoutput:" + cycOutputString); 2384 m_log.Debug("Cycoutput:" + cycOutputString);
2383 //streamWriter.WriteLine("Client Message"); 2385 //streamWriter.WriteLine("Client Message");
2384 //Console.WriteLine("Client Message"); 2386 //m_log.Debug("Client Message");
2385 streamWriter.Flush(); 2387 streamWriter.Flush();
2386 } 2388 }
2387 2389
2388 } 2390 }
2389 catch 2391 catch
2390 { 2392 {
2391 Console.WriteLine("Exception reading from Server"); 2393 m_log.Error("Exception reading from Server");
2392 return ""; 2394 return "";
2393 } 2395 }
2394 // tidy up 2396 // tidy up
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs
index a7cf369..f07512c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/YP2CSConverter.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
68 YP.see(myCode_SR); 68 YP.see(myCode_SR);
69 YP.tell(myCS_SW); 69 YP.tell(myCS_SW);
70 70
71 //Console.WriteLine("Mycode\n ===================================\n" + myCode+"\n"); 71 //m_log.Debug("Mycode\n ===================================\n" + myCode+"\n");
72 72
73// disable warning: don't see how we can code this differently short 73// disable warning: don't see how we can code this differently short
74// of rewriting the whole thing 74// of rewriting the whole thing
@@ -78,9 +78,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
78 foreach (bool l2 in YPCompiler.makeFunctionPseudoCode(TermList, FunctionCode)) 78 foreach (bool l2 in YPCompiler.makeFunctionPseudoCode(TermList, FunctionCode))
79 { 79 {
80 // ListPair VFC = new ListPair(FunctionCode, new Variable()); 80 // ListPair VFC = new ListPair(FunctionCode, new Variable());
81 //Console.WriteLine("-------------------------") 81 //m_log.Debug("-------------------------")
82 //Console.WriteLine(FunctionCode.ToString()) 82 //m_log.Debug(FunctionCode.ToString())
83 //Console.WriteLine("-------------------------") 83 //m_log.Debug("-------------------------")
84 YPCompiler.convertFunctionCSharp(FunctionCode); 84 YPCompiler.convertFunctionCSharp(FunctionCode);
85 //YPCompiler.convertStringCodesCSharp(VFC); 85 //YPCompiler.convertStringCodesCSharp(VFC);
86 } 86 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index c1d6f8e..bcd4ccd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -451,11 +451,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
451 451
452 public void VarDump(Dictionary<string, object> vars) 452 public void VarDump(Dictionary<string, object> vars)
453 { 453 {
454 Console.WriteLine("Variable dump for script {0}", m_ItemID.ToString()); 454 m_log.Info("Variable dump for script "+ m_ItemID.ToString());
455 foreach (KeyValuePair<string, object> v in vars) 455 foreach (KeyValuePair<string, object> v in vars)
456 { 456 {
457 Console.WriteLine("Variable: {0} = '{1}'", v. Key, 457 m_log.Info("Variable: "+v.Key+" = "+v.Value.ToString());
458 v.Value.ToString());
459 } 458 }
460 } 459 }
461 460
@@ -881,7 +880,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
881 } 880 }
882 catch(Exception e) 881 catch(Exception e)
883 { 882 {
884 Console.WriteLine("Unable to save xml\n"+e.ToString()); 883 m_log.Error("Unable to save xml\n"+e.ToString());
885 } 884 }
886 if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state"))) 885 if (!File.Exists(Path.Combine(Path.GetDirectoryName(assembly), m_ItemID.ToString() + ".state")))
887 { 886 {
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index b1b82e5..770c546 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
83 if (part == null) 83 if (part == null)
84 return; 84 return;
85 85
86 Console.WriteLine("Paid: {0} from {1}, amount {2}", objectID,agentID,amount); 86 m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount);
87 if (part.ParentGroup != null) 87 if (part.ParentGroup != null)
88 part = part.ParentGroup.RootPart; 88 part = part.ParentGroup.RootPart;
89 89
diff --git a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
index 93f29d7..3259686 100644
--- a/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
+++ b/OpenSim/ScriptEngine/Components/DotNetEngine/Scheduler/BaseClassFactory.cs
@@ -108,7 +108,7 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
108 // ilgen.Emit(OpCodes.Call, typeof(string).GetMethod 108 // ilgen.Emit(OpCodes.Call, typeof(string).GetMethod
109 //("Format", new Type[] { typeof(string), typeof(object) })); 109 //("Format", new Type[] { typeof(string), typeof(object) }));
110 110
111 // // Console.WriteLine("Hello, World!"); 111 // // m_log.Debug("Hello, World!");
112 // // 112 // //
113 // ilgen.Emit(OpCodes.Call, typeof(Console).GetMethod 113 // ilgen.Emit(OpCodes.Call, typeof(Console).GetMethod
114 // ("WriteLine", new Type[] { typeof(string) })); 114 // ("WriteLine", new Type[] { typeof(string) }));
@@ -237,4 +237,4 @@ namespace OpenSim.ScriptEngine.Components.DotNetEngine.Scheduler
237 //string a = ""; 237 //string a = "";
238 } 238 }
239 } 239 }
240} \ No newline at end of file 240}
diff --git a/OpenSim/ScriptEngine/Shared/EventParams.cs b/OpenSim/ScriptEngine/Shared/EventParams.cs
index 0962aec..28eaa58 100644
--- a/OpenSim/ScriptEngine/Shared/EventParams.cs
+++ b/OpenSim/ScriptEngine/Shared/EventParams.cs
@@ -30,6 +30,8 @@ using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Region.ScriptEngine.Shared; 32using OpenSim.Region.ScriptEngine.Shared;
33using log4net;
34using System.Reflection;
33 35
34namespace OpenSim.ScriptEngine.Shared 36namespace OpenSim.ScriptEngine.Shared
35{ 37{
@@ -38,6 +40,7 @@ namespace OpenSim.ScriptEngine.Shared
38 /// </summary> 40 /// </summary>
39 public class EventParams 41 public class EventParams
40 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 public string EventName; 44 public string EventName;
42 public Object[] Params; 45 public Object[] Params;
43 public Region.ScriptEngine.Shared.DetectParams[] DetectParams; 46 public Region.ScriptEngine.Shared.DetectParams[] DetectParams;
@@ -66,9 +69,14 @@ namespace OpenSim.ScriptEngine.Shared
66 } 69 }
67 public void test2(string functionName, params object[] args) 70 public void test2(string functionName, params object[] args)
68 { 71 {
69 System.Console.WriteLine(functionName, args); 72 String logMessage = functionName;
73 foreach (object arg in args)
74 {
75 logMessage +=", "+arg;
76 }
77 m_log.Debug(logMessage);
70 } 78 }
71 79
72 80
73 } 81 }
74} \ No newline at end of file 82}
diff --git a/prebuild.xml b/prebuild.xml
index f4fd32e..bcaae4f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -417,6 +417,7 @@
417 <Reference name="PhysX_Wrapper_Dotnet.dll"/> 417 <Reference name="PhysX_Wrapper_Dotnet.dll"/>
418 <Reference name="OpenSim.Framework"/> 418 <Reference name="OpenSim.Framework"/>
419 <Reference name="OpenSim.Region.Physics.Manager"/> 419 <Reference name="OpenSim.Region.Physics.Manager"/>
420 <Reference name="log4net.dll"/>
420 <Files> 421 <Files>
421 <Match pattern="*.cs" recurse="true"/> 422 <Match pattern="*.cs" recurse="true"/>
422 </Files> 423 </Files>
@@ -2960,3 +2961,4 @@
2960</Prebuild> 2961</Prebuild>
2961 2962
2962 2963
2964