OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced some Console.WriteLine calls with writes to log.

0.6.0-stable
Jeff Ames 2008-03-17 17:10:53 +00:00
parent 5160733ba1
commit 825c89e7ac
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -165,12 +165,13 @@ namespace OpenSim.Framework.Communications
else else
{ {
m_inventoryService.CreateNewUserInventory(userProf.UUID); m_inventoryService.CreateNewUserInventory(userProf.UUID);
System.Console.WriteLine("[USERS]: Created new inventory set for " + firstName + " " + lastName); m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
return userProf.UUID; return userProf.UUID;
} }
} }
#region Friend Methods #region Friend Methods
/// <summary> /// <summary>
/// Adds a new friend to the database for XUser /// Adds a new friend to the database for XUser
/// </summary> /// </summary>
@ -181,6 +182,7 @@ namespace OpenSim.Framework.Communications
{ {
m_userService.AddNewUserFriend(friendlistowner, friend, perms); m_userService.AddNewUserFriend(friendlistowner, friend, perms);
} }
/// <summary> /// <summary>
/// Logs off a user and does the appropriate communications /// Logs off a user and does the appropriate communications
/// </summary> /// </summary>
@ -216,6 +218,7 @@ namespace OpenSim.Framework.Communications
{ {
m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms); m_userService.UpdateUserFriendPerms(friendlistowner, friend, perms);
} }
/// <summary> /// <summary>
/// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner
/// </summary> /// </summary>

4
OpenSim/Grid/UserServer/UserManager.cs
View File

@ -42,8 +42,10 @@ namespace OpenSim.Grid.UserServer
public class UserManager : UserManagerBase public class UserManager : UserManagerBase
{ {
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public event logOffUser OnLogOffUser; public event logOffUser OnLogOffUser;
private logOffUser handlerLogOffUser = null; private logOffUser handlerLogOffUser = null;
/// <summary> /// <summary>
/// Deletes an active agent session /// Deletes an active agent session
/// </summary> /// </summary>
@ -168,7 +170,7 @@ namespace OpenSim.Grid.UserServer
returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]); returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]);
} }
Console.WriteLine("[AVATARINFO]: Servicing Avatar Query: " + (string) requestData["avquery"]); m_log.InfoFormat("[AVATARINFO]: Servicing Avatar Query: " + (string) requestData["avquery"]);
return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar); return AvatarPickerListtoXmlRPCResponse(queryID, returnAvatar);
} }

24
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -51,13 +51,13 @@ namespace OpenSim.Region.ClientStack
/// </summary> /// </summary>
public class ClientView : IClientAPI public class ClientView : IClientAPI
{ {
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
// ~ClientView() // ~ClientView()
// { // {
// System.Console.WriteLine("[CLIENTVIEW]: Destructor called"); // m_log.Info("[CLIENTVIEW]: Destructor called");
// } // }
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
/* static variables */ /* static variables */
public static TerrainManager TerrainManager; public static TerrainManager TerrainManager;
@ -1820,7 +1820,7 @@ namespace OpenSim.Region.ClientStack
public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint) public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
{ {
ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach); ObjectAttachPacket attach = (ObjectAttachPacket)PacketPool.Instance.GetPacket(PacketType.ObjectAttach);
System.Console.WriteLine("Attach object!"); Console.WriteLine("Attach object!");
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet
attach.AgentData.AgentID = AgentId; attach.AgentData.AgentID = AgentId;
attach.AgentData.SessionID = m_sessionId; attach.AgentData.SessionID = m_sessionId;
@ -2340,7 +2340,7 @@ namespace OpenSim.Region.ClientStack
/// <returns></returns> /// <returns></returns>
protected bool AgentTextureCached(IClientAPI simclient, Packet packet) protected bool AgentTextureCached(IClientAPI simclient, Packet packet)
{ {
//System.Console.WriteLine("texture cached: " + packet.ToString()); //Console.WriteLine("texture cached: " + packet.ToString());
AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet
@ -2368,7 +2368,7 @@ namespace OpenSim.Region.ClientStack
protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet) protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet)
{ {
MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
// System.Console.WriteLine("new multi update packet " + multipleupdate.ToString()); // Console.WriteLine("new multi update packet " + multipleupdate.ToString());
Scene tScene = (Scene)m_scene; Scene tScene = (Scene)m_scene;
for (int i = 0; i < multipleupdate.ObjectData.Length; i++) for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
@ -2407,7 +2407,7 @@ namespace OpenSim.Region.ClientStack
if (handlerUpdatePrimSinglePosition != null) if (handlerUpdatePrimSinglePosition != null)
{ {
// System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
handlerUpdatePrimSinglePosition(localId, pos1, this); handlerUpdatePrimSinglePosition(localId, pos1, this);
} }
break; break;
@ -2418,7 +2418,7 @@ namespace OpenSim.Region.ClientStack
if (handlerUpdatePrimSingleRotation != null) if (handlerUpdatePrimSingleRotation != null)
{ {
//System.Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); //Console.WriteLine("new tab rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
handlerUpdatePrimSingleRotation(localId, rot1, this); handlerUpdatePrimSingleRotation(localId, rot1, this);
} }
break; break;
@ -2429,7 +2429,7 @@ namespace OpenSim.Region.ClientStack
if (handlerUpdatePrimSingleRotation != null) if (handlerUpdatePrimSingleRotation != null)
{ {
//System.Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W); //Console.WriteLine("new mouse rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
handlerUpdatePrimSingleRotation(localId, rot2, this); handlerUpdatePrimSingleRotation(localId, rot2, this);
} }
break; break;
@ -2496,7 +2496,7 @@ namespace OpenSim.Region.ClientStack
// Change the position based on scale (for bug number 246) // Change the position based on scale (for bug number 246)
handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
// System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); // Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
if (handlerUpdatePrimSinglePosition != null) if (handlerUpdatePrimSinglePosition != null)
{ {
handlerUpdatePrimSinglePosition(localId, pos4, this); handlerUpdatePrimSinglePosition(localId, pos4, this);
@ -3311,7 +3311,7 @@ namespace OpenSim.Region.ClientStack
AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack; AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack;
AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData; AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData;
AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data; AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data;
//System.Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name)); //Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name));
handlerAvatarPickerRequest = OnAvatarPickerRequest; handlerAvatarPickerRequest = OnAvatarPickerRequest;
if (handlerAvatarPickerRequest != null) if (handlerAvatarPickerRequest != null)
@ -4201,7 +4201,7 @@ namespace OpenSim.Region.ClientStack
} }
break; break;
case PacketType.ParcelObjectOwnersRequest: case PacketType.ParcelObjectOwnersRequest:
//System.Console.WriteLine(Pack.ToString()); //Console.WriteLine(Pack.ToString());
ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack; ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;
handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest; handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest;

16
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -328,7 +328,7 @@ namespace OpenSim.Region.Communications.OGS1
if (responseData.ContainsKey("error")) if (responseData.ContainsKey("error"))
{ {
Console.WriteLine("[OGS1 GRID SERVICES]: Error received from grid server" + responseData["error"]); m_log.Error("[OGS1 GRID SERVICES]: Error received from grid server" + responseData["error"]);
return null; return null;
} }
@ -588,7 +588,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
else else
{ {
Console.WriteLine("remoting object not found"); m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
} }
remObject = null; remObject = null;
//m_log.Info("[INTER]: " + //m_log.Info("[INTER]: " +
@ -699,7 +699,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
else else
{ {
Console.WriteLine("[OGS1 GRID SERVICES]: remoting object not found"); m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
} }
remObject = null; remObject = null;
m_log.Info("[OGS1 GRID SERVICES]: " + m_log.Info("[OGS1 GRID SERVICES]: " +
@ -812,7 +812,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
else else
{ {
Console.WriteLine("remoting object not found"); m_log.Warn("[OGS1 GRID SERVICES]: remoting object not found");
} }
remObject = null; remObject = null;
m_log.Info("[INTER]: " + gdebugRegionName + ": OGS1 tried to inform region I'm up"); m_log.Info("[INTER]: " + gdebugRegionName + ": OGS1 tried to inform region I'm up");
@ -924,7 +924,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
else else
{ {
Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
} }
remObject = null; remObject = null;
@ -1010,7 +1010,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
else else
{ {
Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
} }
remObject = null; remObject = null;
@ -1066,7 +1066,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
else else
{ {
Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
} }
remObject = null; remObject = null;
@ -1140,7 +1140,7 @@ namespace OpenSim.Region.Communications.OGS1
} }
else else
{ {
Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); m_log.Warn("[OGS1 GRID SERVICES]: Remoting object not found");
} }
remObject = null; remObject = null;