diff options
9 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Framework/Servers/CheckSumServer.cs b/OpenSim/Framework/Servers/CheckSumServer.cs index ef4c0ee..854c836 100644 --- a/OpenSim/Framework/Servers/CheckSumServer.cs +++ b/OpenSim/Framework/Servers/CheckSumServer.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Servers | |||
113 | } | 113 | } |
114 | catch (Exception) | 114 | catch (Exception) |
115 | { | 115 | { |
116 | OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection "); | 116 | OpenSim.Framework.Console.MainLog.Instance.Warn("CheckSumServer.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection "); |
117 | 117 | ||
118 | } | 118 | } |
119 | } | 119 | } |
diff --git a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs index d81e5cc..050df83 100644 --- a/OpenSim/Grid/GridServer.Config/DbGridConfig.cs +++ b/OpenSim/Grid/GridServer.Config/DbGridConfig.cs | |||
@@ -63,7 +63,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
63 | /// User configuration for the Grid Config interfaces | 63 | /// User configuration for the Grid Config interfaces |
64 | /// </summary> | 64 | /// </summary> |
65 | public void LoadDefaults() { | 65 | public void LoadDefaults() { |
66 | MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); | 66 | MainLog.Instance.Notice("DbGridConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); |
67 | 67 | ||
68 | // About the grid options | 68 | // About the grid options |
69 | this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); | 69 | this.GridOwner = MainLog.Instance.CmdPrompt("Grid owner", "OGS development team"); |
@@ -95,7 +95,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
95 | IObjectSet result = db.Get(typeof(DbGridConfig)); | 95 | IObjectSet result = db.Get(typeof(DbGridConfig)); |
96 | // Found? | 96 | // Found? |
97 | if(result.Count==1) { | 97 | if(result.Count==1) { |
98 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a GridConfig object in the local database, loading"); | 98 | MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Found a GridConfig object in the local database, loading"); |
99 | foreach (DbGridConfig cfg in result) { | 99 | foreach (DbGridConfig cfg in result) { |
100 | // Import each setting into this class | 100 | // Import each setting into this class |
101 | // Grid Settings | 101 | // Grid Settings |
@@ -114,7 +114,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
114 | } | 114 | } |
115 | // Create a new configuration object from this class | 115 | // Create a new configuration object from this class |
116 | } else { | 116 | } else { |
117 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); | 117 | MainLog.Instance.Verbose("DbGridConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); |
118 | 118 | ||
119 | // Load default settings into this class | 119 | // Load default settings into this class |
120 | LoadDefaults(); | 120 | LoadDefaults(); |
@@ -127,7 +127,7 @@ namespace OpenGrid.Config.GridConfigDb4o | |||
127 | db.Close(); | 127 | db.Close(); |
128 | } | 128 | } |
129 | } catch(Exception e) { | 129 | } catch(Exception e) { |
130 | MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 130 | MainLog.Instance.Warn("DbGridConfig.cs:InitConfig() - Exception occured"); |
131 | MainLog.Instance.Warn(e.ToString()); | 131 | MainLog.Instance.Warn(e.ToString()); |
132 | } | 132 | } |
133 | 133 | ||
diff --git a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs index cb0dbdd..1f93779 100644 --- a/OpenSim/Grid/UserServer.Config/DbUserConfig.cs +++ b/OpenSim/Grid/UserServer.Config/DbUserConfig.cs | |||
@@ -47,7 +47,7 @@ namespace OpenUser.Config.UserConfigDb4o | |||
47 | private IObjectContainer db; | 47 | private IObjectContainer db; |
48 | 48 | ||
49 | public void LoadDefaults() { | 49 | public void LoadDefaults() { |
50 | MainLog.Instance.Notice("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); | 50 | MainLog.Instance.Notice("DbUserConfig.cs:LoadDefaults() - Please press enter to retain default or enter new settings"); |
51 | 51 | ||
52 | this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); | 52 | this.DefaultStartupMsg = MainLog.Instance.CmdPrompt("Default startup message", "Welcome to OGS"); |
53 | 53 | ||
@@ -61,7 +61,7 @@ namespace OpenUser.Config.UserConfigDb4o | |||
61 | db = Db4oFactory.OpenFile("openuser.yap"); | 61 | db = Db4oFactory.OpenFile("openuser.yap"); |
62 | IObjectSet result = db.Get(typeof(DbUserConfig)); | 62 | IObjectSet result = db.Get(typeof(DbUserConfig)); |
63 | if(result.Count==1) { | 63 | if(result.Count==1) { |
64 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Found a UserConfig object in the local database, loading"); | 64 | MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Found a UserConfig object in the local database, loading"); |
65 | foreach (DbUserConfig cfg in result) { | 65 | foreach (DbUserConfig cfg in result) { |
66 | this.GridServerURL=cfg.GridServerURL; | 66 | this.GridServerURL=cfg.GridServerURL; |
67 | this.GridSendKey=cfg.GridSendKey; | 67 | this.GridSendKey=cfg.GridSendKey; |
@@ -69,14 +69,14 @@ namespace OpenUser.Config.UserConfigDb4o | |||
69 | this.DefaultStartupMsg=cfg.DefaultStartupMsg; | 69 | this.DefaultStartupMsg=cfg.DefaultStartupMsg; |
70 | } | 70 | } |
71 | } else { | 71 | } else { |
72 | MainLog.Instance.Verbose("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); | 72 | MainLog.Instance.Verbose("DbUserConfig.cs:InitConfig() - Could not find object in database, loading precompiled defaults"); |
73 | LoadDefaults(); | 73 | LoadDefaults(); |
74 | MainLog.Instance.Verbose("Writing out default settings to local database"); | 74 | MainLog.Instance.Verbose("Writing out default settings to local database"); |
75 | db.Set(this); | 75 | db.Set(this); |
76 | db.Close(); | 76 | db.Close(); |
77 | } | 77 | } |
78 | } catch(Exception e) { | 78 | } catch(Exception e) { |
79 | MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 79 | MainLog.Instance.Warn("DbUserConfig.cs:InitConfig() - Exception occured"); |
80 | MainLog.Instance.Warn(e.ToString()); | 80 | MainLog.Instance.Warn(e.ToString()); |
81 | } | 81 | } |
82 | 82 | ||
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index bf2a678..28d8513 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -297,7 +297,7 @@ namespace OpenSim.Region.ClientStack | |||
297 | catch (Exception e) | 297 | catch (Exception e) |
298 | { | 298 | { |
299 | MainLog.Instance.Warn("client", | 299 | MainLog.Instance.Warn("client", |
300 | "ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString()); | 300 | "ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString()); |
301 | } | 301 | } |
302 | } | 302 | } |
303 | 303 | ||
@@ -324,7 +324,7 @@ namespace OpenSim.Region.ClientStack | |||
324 | catch (Exception e) | 324 | catch (Exception e) |
325 | { | 325 | { |
326 | MainLog.Instance.Warn("client", | 326 | MainLog.Instance.Warn("client", |
327 | "ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString()); | 327 | "ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString()); |
328 | } | 328 | } |
329 | } | 329 | } |
330 | 330 | ||
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs index efeff29..2678a98 100644 --- a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs +++ b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs | |||
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack | |||
158 | catch (Exception) | 158 | catch (Exception) |
159 | { | 159 | { |
160 | MainLog.Instance.Warn("client", | 160 | MainLog.Instance.Warn("client", |
161 | "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + | 161 | "ClientView.PacketQueue.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + |
162 | userEP.ToString() + " - killing thread"); | 162 | userEP.ToString() + " - killing thread"); |
163 | KillThread(); | 163 | KillThread(); |
164 | } | 164 | } |
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 89e5465..3b996d5 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -388,7 +388,7 @@ namespace OpenSim.Region.ClientStack | |||
388 | } | 388 | } |
389 | break; | 389 | break; |
390 | case PacketType.TransferRequest: | 390 | case PacketType.TransferRequest: |
391 | //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request"); | 391 | //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); |
392 | TransferRequestPacket transfer = (TransferRequestPacket) Pack; | 392 | TransferRequestPacket transfer = (TransferRequestPacket) Pack; |
393 | m_assetCache.AddAssetRequest(this, transfer); | 393 | m_assetCache.AddAssetRequest(this, transfer); |
394 | break; | 394 | break; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 279f34e..e37ad59 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -497,7 +497,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
497 | } | 497 | } |
498 | catch (Exception e) | 498 | catch (Exception e) |
499 | { | 499 | { |
500 | MainLog.Instance.Warn("terrain", "World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); | 500 | MainLog.Instance.Warn("terrain", "Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString()); |
501 | } | 501 | } |
502 | } | 502 | } |
503 | 503 | ||
@@ -1079,7 +1079,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1079 | /// <param name="agent"></param> | 1079 | /// <param name="agent"></param> |
1080 | public void NewUserConnection(ulong regionHandle, AgentCircuitData agent) | 1080 | public void NewUserConnection(ulong regionHandle, AgentCircuitData agent) |
1081 | { | 1081 | { |
1082 | // Console.WriteLine("World.cs - add new user connection"); | 1082 | // Console.WriteLine("Scene.cs - add new user connection"); |
1083 | //should just check that its meant for this region | 1083 | //should just check that its meant for this region |
1084 | if (regionHandle == m_regInfo.RegionHandle) | 1084 | if (regionHandle == m_regInfo.RegionHandle) |
1085 | { | 1085 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 4ad9d65..ba4c40e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
146 | } | 146 | } |
147 | catch (Exception e) | 147 | catch (Exception e) |
148 | { | 148 | { |
149 | MainLog.Instance.Error("SCENE", "World.cs: Close() - Failed with exception " + e.ToString()); | 149 | MainLog.Instance.Error("SCENE", "SceneBase.cs: Close() - Failed with exception " + e.ToString()); |
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs index f43a9fc..5de816f 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
44 | 44 | ||
45 | public void LoadAnims() | 45 | public void LoadAnims() |
46 | { | 46 | { |
47 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations"); | 47 | //OpenSim.Framework.Console.MainLog.Instance.Verbose("ScenePresence.Animations.cs:LoadAnims() - Loading avatar animations"); |
48 | using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) | 48 | using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) |
49 | { | 49 | { |
50 | XmlDocument doc = new XmlDocument(); | 50 | XmlDocument doc = new XmlDocument(); |