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

Undo SetAppearance supression. Debug statements

dsg
Robert Adams 2010-10-15 14:54:01 -07:00
parent cf5aeb9a68
commit 62fbd2ef08
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/AvatarAppearance.cs
View File

@ -363,7 +363,8 @@ namespace OpenSim.Framework
// This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist // This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist
SetDefaultParams(m_visualparams); SetDefaultParams(m_visualparams);
SetDefaultWearables(); SetDefaultWearables();
m_texture = null;//GetDefaultTexture(); // m_texture = null;//GetDefaultTexture();
m_texture = GetDefaultTexture();
} }
public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams) public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams)
@ -372,7 +373,8 @@ namespace OpenSim.Framework
m_serial = 1; m_serial = 1;
m_wearables = wearables; m_wearables = wearables;
m_visualparams = visualParams; m_visualparams = visualParams;
m_texture = null;// GetDefaultTexture(); // m_texture = null;// GetDefaultTexture();
m_texture = GetDefaultTexture();
} }
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

11
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs
View File

@ -28,6 +28,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Reflection;
using log4net;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
@ -43,6 +45,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
private short count = 0; private short count = 0;
private short frame = 0; private short frame = 0;
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// disable warning: public events, part of the public API // disable warning: public events, part of the public API
#pragma warning disable 67 #pragma warning disable 67
@ -322,7 +326,9 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
m_firstName = first; m_firstName = first;
m_lastName = last; m_lastName = last;
m_startPos = startPos; m_startPos = startPos;
m_log.Debug("[REGION SYNC AVATAR] instance");
//m_scene.EventManager.OnFrame += Update; //m_scene.EventManager.OnFrame += Update;
} }
@ -430,10 +436,12 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public virtual void SendWearables(AvatarWearable[] wearables, int serial) public virtual void SendWearables(AvatarWearable[] wearables, int serial)
{ {
m_log.Debug("[REGION SYNC AVATAR] SendWearables");
} }
public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
{ {
m_log.Debug("[REGION SYNC AVATAR] SendAppearance");
} }
public virtual void Kick(string message) public virtual void Kick(string message)
@ -566,6 +574,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
{ {
m_log.Debug("[REGION SYNC AVATAR] AttachObject");
} }
public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)

2
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs
View File

@ -484,7 +484,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
int delay = 30000; int delay = 30000;
string name = presence.Name; string name = presence.Name;
//m_log.WarnFormat("{0} Waiting {1}ms before setting appearance on presence {2} <{3}>", LogHeader, delay, name, msgID); m_log.WarnFormat("{0} Waiting {1}ms before setting appearance on presence {2} <{3}>", LogHeader, delay, name, msgID);
Timer appearanceSetter = new Timer(delegate(object obj) Timer appearanceSetter = new Timer(delegate(object obj)
{ {
//m_log.WarnFormat("{0} Ready to set appearance on presence {1} <{2}>", LogHeader, name, msgID); //m_log.WarnFormat("{0} Ready to set appearance on presence {1} <{2}>", LogHeader, name, msgID);