aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs1
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs10
5 files changed, 18 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index 643b158..d5e55a7 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.ClientStack
56 56
57 protected virtual bool Logout(IClientAPI client, Packet packet) 57 protected virtual bool Logout(IClientAPI client, Packet packet)
58 { 58 {
59 MainLog.Instance.Verbose("OpenSimClient.cs:ProcessInPacket() - Got a logout request"); 59 MainLog.Instance.Verbose("CLIENT", "Got a logout request");
60 60
61 if( OnLogout != null ) 61 if( OnLogout != null )
62 { 62 {
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index cf4072c..7a55c35 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ClientStack
100 // m_inventoryCache = inventoryCache; 100 // m_inventoryCache = inventoryCache;
101 m_authenticateSessionsHandler = authenSessions; 101 m_authenticateSessionsHandler = authenSessions;
102 102
103 MainLog.Instance.Verbose("OpenSimClient.cs - Started up new client thread to handle incoming request"); 103 MainLog.Instance.Verbose("CLIENT","Started up new client thread to handle incoming request");
104 cirpack = initialcirpack; 104 cirpack = initialcirpack;
105 userEP = remoteEP; 105 userEP = remoteEP;
106 106
@@ -224,7 +224,7 @@ namespace OpenSim.Region.ClientStack
224 224
225 protected virtual void ClientLoop() 225 protected virtual void ClientLoop()
226 { 226 {
227 MainLog.Instance.Verbose("OpenSimClient.cs:ClientLoop() - Entered loop"); 227 MainLog.Instance.Verbose("CLIENT", "Entered loop");
228 while (true) 228 while (true)
229 { 229 {
230 QueItem nextPacket = PacketQueue.Dequeue(); 230 QueItem nextPacket = PacketQueue.Dequeue();
@@ -282,7 +282,7 @@ namespace OpenSim.Region.ClientStack
282 clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity); 282 clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
283 clientPingTimer.Enabled = true; 283 clientPingTimer.Enabled = true;
284 284
285 MainLog.Instance.Verbose("OpenSimClient.cs:InitNewClient() - Adding viewer agent to scene"); 285 MainLog.Instance.Verbose("CLIENT","Adding viewer agent to scene");
286 this.m_scene.AddNewClient(this, true); 286 this.m_scene.AddNewClient(this, true);
287 } 287 }
288 288
@@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack
293 if (!sessionInfo.Authorised) 293 if (!sessionInfo.Authorised)
294 { 294 {
295 //session/circuit not authorised 295 //session/circuit not authorised
296 MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); 296 MainLog.Instance.Notice("CLIENT", "New user request denied to " + userEP.ToString());
297 ClientThread.Abort(); 297 ClientThread.Abort();
298 } 298 }
299 else 299 else
300 { 300 {
301 MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); 301 MainLog.Instance.Notice("CLIENT", "Got authenticated connection from " + userEP.ToString());
302 //session is authorised 302 //session is authorised
303 m_agentId = cirpack.CircuitCode.ID; 303 m_agentId = cirpack.CircuitCode.ID;
304 this.m_sessionId = cirpack.CircuitCode.SessionID; 304 this.m_sessionId = cirpack.CircuitCode.SessionID;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ee47678..84eb503 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -859,14 +859,14 @@ namespace OpenSim.Region.Environment.Scenes
859 859
860 if (child) 860 if (child)
861 { 861 {
862 MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new child agent."); 862 MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Creating new child agent.");
863 } 863 }
864 else 864 else
865 { 865 {
866 newAvatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement; 866 newAvatar.OnSignificantClientMovement += m_LandManager.handleSignificantClientMovement;
867 867
868 MainLog.Instance.Verbose(RegionInfo.RegionName + ": Creating new root agent."); 868 MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Creating new root agent.");
869 MainLog.Instance.Verbose(RegionInfo.RegionName + ": Adding Physical agent."); 869 MainLog.Instance.Verbose("SCENE", RegionInfo.RegionName + ": Adding Physical agent.");
870 870
871 newAvatar.AddToPhysicalScene(); 871 newAvatar.AddToPhysicalScene();
872 } 872 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2f5829a..99f78c9 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -234,7 +234,6 @@ namespace OpenSim.Region.Environment.Scenes
234 234
235 m_regionInfo = reginfo; 235 m_regionInfo = reginfo;
236 m_regionHandle = reginfo.RegionHandle; 236 m_regionHandle = reginfo.RegionHandle;
237 MainLog.Instance.Verbose("Avatar.cs ");
238 m_controllingClient = client; 237 m_controllingClient = client;
239 m_firstname = m_controllingClient.FirstName; 238 m_firstname = m_controllingClient.FirstName;
240 m_lastname = m_controllingClient.LastName; 239 m_lastname = m_controllingClient.LastName;
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index e2614ee..95772df 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -98,11 +98,19 @@ namespace OpenSim.DataStore.MonoSqlite
98 try 98 try
99 { 99 {
100 shapeDa.Fill(ds.Tables["primshapes"]); 100 shapeDa.Fill(ds.Tables["primshapes"]);
101 }
102 catch (Exception)
103 {
104 MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes table");
105 }
106
107 try
108 {
101 terrainDa.Fill(ds.Tables["terrain"]); 109 terrainDa.Fill(ds.Tables["terrain"]);
102 } 110 }
103 catch (Exception) 111 catch (Exception)
104 { 112 {
105 MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes or terrain table"); 113 MainLog.Instance.Verbose("DATASTORE", "Caught fill error on terrain table");
106 } 114 }
107 return; 115 return;
108 } 116 }