diff options
Diffstat (limited to 'OpenSim/Region')
6 files changed, 8 insertions, 8 deletions
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(); |