ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:

Browse Source 
* 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.
This commit is contained in:
Charles Krinke
2009-02-22 20:52:55 +00:00
parent 913654f2c9
commit 8f55b9d735
117 changed files with 580 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/AgentCircuitManager.cs
View File

@@ -122,7 +122,7 @@ namespace OpenSim.Framework
AgentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
AgentCircuits[(uint) agentData.circuitcode].SessionID = agentData.SessionID;
// Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
// m_log.Debug("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
}
}

12
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -291,17 +291,17 @@ namespace OpenSim.Framework
+ 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height
+ 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length
- m_avatarHeight / 2) * 0.3f - 0.04f;
//System.Console.WriteLine(">>>>>>> [APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
//System.Console.WriteLine("------------- Set Appearance Texture ---------------");
//m_log.Debug(">>>>>>> [APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
//m_log.Debug("------------- Set Appearance Texture ---------------");
//Primitive.TextureEntryFace[] faces = Texture.FaceTextures;
//foreach (Primitive.TextureEntryFace face in faces)
//{
// if (face != null)
// System.Console.WriteLine(" ++ " + face.TextureID);
// m_log.Debug(" ++ " + face.TextureID);
// else
// System.Console.WriteLine(" ++ NULL ");
// m_log.Debug(" ++ NULL ");
//}
//System.Console.WriteLine("----------------------------");
//m_log.Debug("----------------------------");
}
@@ -350,7 +350,7 @@ namespace OpenSim.Framework
m_avatarHeight = (float)info.GetValue("m_avatarHeight", typeof(float));
//System.Console.WriteLine("AvatarAppearance Deserialize END");
//m_log.Debug("AvatarAppearance Deserialize END");
}
// this is used for OGS1

4
OpenSim/Framework/AvatarWearable.cs
View File

@@ -50,7 +50,7 @@ namespace OpenSim.Framework
protected AvatarWearable(SerializationInfo info, StreamingContext context)
{
//System.Console.WriteLine("AvatarWearable Deserialize BGN");
//m_log.Debug("AvatarWearable Deserialize BGN");
if (info == null)
{
throw new ArgumentNullException("info");
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
AssetID = new UUID((Guid) info.GetValue("AssetID", typeof (Guid)));
ItemID = new UUID((Guid) info.GetValue("ItemID", typeof (Guid)));
//System.Console.WriteLine("AvatarWearable Deserialize END");
//m_log.Debug("AvatarWearable Deserialize END");
}
public static AvatarWearable[] DefaultWearables

8
OpenSim/Framework/ChildAgentDataUpdate.cs
View File

@@ -576,10 +576,10 @@ namespace OpenSim.Framework
public void Dump()
{
System.Console.WriteLine("------------ AgentData ------------");
System.Console.WriteLine("UUID: " + AgentID);
System.Console.WriteLine("Region: " + RegionHandle);
System.Console.WriteLine("Position: " + Position);
m_log.Info("------------ AgentData ------------");
m_log.Info("UUID: " + AgentID);
m_log.Info("Region: " + RegionHandle);
m_log.Info("Position: " + Position);
}
}
*/

4
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -510,11 +510,11 @@ namespace OpenSim.Framework.Communications.Cache
//inventory asset request
requestID = new UUID(transferRequest.TransferInfo.Params, 80);
source = 3;
//Console.WriteLine("asset request " + requestID);
//m_log.Debug("asset request " + requestID);
}
//check to see if asset is in local cache, if not we need to request it from asset server.
//Console.WriteLine("asset request " + requestID);
//m_log.Debug("asset request " + requestID);
if (!m_memcache.Contains(requestID))
{
//not found asset

4
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@@ -464,7 +464,7 @@ namespace OpenSim.Framework.Communications.Capabilities
/// <returns></returns>
public string RequestTexture(string request, string path, string param)
{
System.Console.WriteLine("texture request " + request);
m_log.Debug("texture request " + request);
// Needs implementing (added to remove compiler warning)
return String.Empty;
}
@@ -670,7 +670,7 @@ namespace OpenSim.Framework.Communications.Capabilities
}
}
//System.Console.WriteLine("asset upload request via CAPS" + llsdRequest.inventory_type +" , "+ llsdRequest.asset_type);
//m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type +" , "+ llsdRequest.asset_type);
string assetName = llsdRequest.name;
string assetDes = llsdRequest.description;

2
OpenSim/Framework/Console/ConsoleBase.cs
View File

@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Console
if (!dict.ContainsKey(helpPart))
break;
//System.Console.WriteLine("Found {0}", helpParts[0]);
//m_log.Debug("Found {0}", helpParts[0]);
if (dict[helpPart] is Dictionary<string, Object>)
dict = (Dictionary<string, object>)dict[helpPart];

2
OpenSim/Framework/HGNetworkServersInfo.cs
View File

@@ -58,7 +58,7 @@ namespace OpenSim.Framework
{
string userServerURI = ServerURI(userserver);
bool ret = (((userServerURI == null) || (userServerURI == "") || (userServerURI == LocalUserServerURI)));
//Console.WriteLine("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
//m_log.Debug("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
return ret;
}

6
OpenSim/Framework/Util.cs
View File

@@ -700,8 +700,7 @@ namespace OpenSim.Framework
}
catch (Exception e)
{
System.Console.WriteLine(e.Message);
System.Console.WriteLine(e.StackTrace);
m_log.Error(e.ToString());
}
finally
{
@@ -728,8 +727,7 @@ namespace OpenSim.Framework
}
catch (Exception e)
{
System.Console.WriteLine(e.Message);
System.Console.WriteLine(e.StackTrace);
m_log.Error(e.ToString());
}
finally
{

2
OpenSim/Framework/WearableItem.cs
View File

@@ -264,7 +264,7 @@ namespace OpenSim.Framework
foreach (string line in lines)
{
string trimLine = line.Trim();
// Console.WriteLine("line : " + trimLine);
// m_log.Debug("line : " + trimLine);
string[] splitLine = r.Split(trimLine);
if (splitLine.Length > 1)