diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Framework | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AgentCircuitManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 12 | ||||
-rw-r--r-- | OpenSim/Framework/AvatarWearable.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Console/ConsoleBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/HGNetworkServersInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Util.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/WearableItem.cs | 2 |
10 files changed, 22 insertions, 24 deletions
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) |