From f2013d3c932af6cf5a022aff8d6ccfa7c84378b4 Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Thu, 6 Jan 2011 09:20:59 -0800 Subject: [PATCH] Updates for appearance and attachments --- .../Client/MXP/ClientStack/MXPClientView.cs | 1 - .../VWoHTTP/ClientStack/VWHClientView.cs | 1 - OpenSim/Framework/IClientAPI.cs | 2 - .../ClientStack/LindenUDP/LLClientView.cs | 2 - .../AvatarFactory/AvatarFactoryModule.cs | 7 ++-- .../RegionSyncModule/RegionSyncAvatar.cs | 1 - .../RegionSyncModule/RegionSyncClient.cs | 28 +++---------- .../Examples/SimpleModule/MyNpcCharacter.cs | 1 - OpenSim/Region/Framework/Scenes/Scene.cs | 36 ++++++++--------- .../Framework/Scenes/SceneObjectPart.cs | 5 ++- .../Region/Framework/Scenes/ScenePresence.cs | 40 +++++++++---------- .../Server/IRCClientView.cs | 1 - .../OptionalModules/World/NPC/NPCAvatar.cs | 1 - OpenSim/Tests/Common/Mock/TestClient.cs | 1 - 14 files changed, 50 insertions(+), 77 deletions(-) diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index b67033ed9a..f522efef16 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs @@ -577,7 +577,6 @@ namespace OpenSim.Client.MXP.ClientStack public event BakeTerrain OnBakeTerrain; public event EstateChangeInfo OnEstateChangeInfo; public event SetAppearance OnSetAppearance; - public event SetAppearanceRaw OnSetAppearanceRaw; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv; diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index e6f8fc4f42..95b92bc7cd 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs @@ -231,7 +231,6 @@ namespace OpenSim.Client.VWoHTTP.ClientStack public event BakeTerrain OnBakeTerrain = delegate { }; public event EstateChangeInfo OnEstateChangeInfo = delegate { }; public event SetAppearance OnSetAppearance = delegate { }; - public event SetAppearanceRaw OnSetAppearanceRaw = delegate { }; public event AvatarNowWearing OnAvatarNowWearing = delegate { }; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv = delegate { return new UUID(); }; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv = delegate { }; diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 34e6539262..5685b7d923 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -67,7 +67,6 @@ namespace OpenSim.Framework public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes); public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams); - public delegate void SetAppearanceRaw(IClientAPI sender, UUID agentID, byte[] vp, Primitive.TextureEntry te); public delegate void StartAnim(IClientAPI remoteClient, UUID animID); @@ -716,7 +715,6 @@ namespace OpenSim.Framework event EstateChangeInfo OnEstateChangeInfo; // [Obsolete("LLClientView Specific.")] event SetAppearance OnSetAppearance; - event SetAppearanceRaw OnSetAppearanceRaw; // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] event AvatarNowWearing OnAvatarNowWearing; event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a90e76c4b2..ceabef8ba8 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -83,7 +83,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP public event Action OnRegionHandShakeReply; public event GenericCall1 OnRequestWearables; public event SetAppearance OnSetAppearance; - public event SetAppearanceRaw OnSetAppearanceRaw; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv; @@ -5770,7 +5769,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP #endregion SetAppearance handlerSetAppearance = OnSetAppearance; - SetAppearanceRaw handlerSetAppearanceRaw = OnSetAppearanceRaw; //if (handlerSetAppearance != null) { // Temporarily protect ourselves from the mantis #951 failure. diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index c5212b5726..3bc68adfea 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs @@ -293,10 +293,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory sp.Appearance = appearance; if (sp.Appearance.AvatarHeight > 0) sp.SetHeight(sp.Appearance.AvatarHeight); - // Send the appearance to everyone in the scene - sp.SendAppearanceToAllOtherAgents(); - // Send animations back to the avatar as well - sp.Animator.SendAnimPack(); + QueueAppearanceSend(agentid); } else { @@ -331,6 +328,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory m_log.WarnFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid); return; } + if (sp.IsSyncedAvatar) + return; // m_log.WarnFormat("[AVFACTORY] avatar {0} save appearance",agentid); diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs index 13ab750222..6b1aeb85b3 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs @@ -66,7 +66,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule public event ModifyTerrain OnModifyTerrain; public event BakeTerrain OnBakeTerrain; public event SetAppearance OnSetAppearance; - public event SetAppearanceRaw OnSetAppearanceRaw; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv; diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs index 3d59fb3dd1..6d256e3ed6 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs @@ -177,7 +177,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule RemoveLocalClient(kvp.Key, m_scene); // Remove the agent update handler from the client kvp.Value.OnAgentUpdateRaw -= HandleAgentUpdateRaw; - kvp.Value.OnSetAppearanceRaw -= HandleSetAppearanceRaw; } } catch (Exception e) @@ -368,7 +367,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule return; } - m_log.DebugFormat("{0} Handle NewAvater for \"{1} {2}\"", LogHeader(), first, last); + m_log.DebugFormat("{0} Handle NewAvatar for \"{1} {2}\"", LogHeader(), first, last); if (m_remoteAvatars.ContainsKey(agentID)) { RegionSyncMessage.HandleWarning(LogHeader(), msg, String.Format("Attempted to add duplicate avatar \"{0} {1}\" ({2})", first, last, agentID.ToString())); @@ -681,6 +680,10 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule return; } + // If we are receiving appearance for a presence connected here, ignore it. + // This is just a confirmation of appearance we sent to scene. + if (m_localAvatars.ContainsKey(agentID)) + return; // Tells the avatar factory to pull an updated appearance from the avatar service m_scene.AvatarFactory.RefreshAppearance(agentID); @@ -866,7 +869,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule // Register for interesting client events which will be forwarded to auth sim // These are the raw packet data blocks from the client, intercepted and sent up to the sim client.OnAgentUpdateRaw += HandleAgentUpdateRaw; - client.OnSetAppearanceRaw += HandleSetAppearanceRaw; client.OnChatFromClientRaw += HandleChatFromClientRaw; client.OnAgentRequestSit += HandleAgentRequestSit; client.OnAgentSit += HandleAgentSit; @@ -949,25 +951,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule Send(new RegionSyncMessage(RegionSyncMessage.MsgType.AgentUpdate, agentData)); } - public void HandleSetAppearanceRaw(object sender, UUID agentID, byte[] vp, Primitive.TextureEntry te) - { - // Try to find the scene presence we want to set the appearance for - ScenePresence sp; - string name = "NOT FOUND"; - if (m_scene.TryGetScenePresence(agentID, out sp)) - name = sp.Name; - m_log.WarnFormat("{0} Received LLClientView.SetAppearance ({1,3},{2,2}) for {3} (\"{4}\")", LogHeader(), vp.Length.ToString(), (te == null) ? "" : "te", agentID.ToString(), sp.Name); - if (sp == null) - { - m_log.WarnFormat("{0} Scene presence could not be found to set appearance.", LogHeader()); - return; - } - - // Set the appearance on the presence. This will generate the needed exchange with the client if rebakes need to take place. - m_log.WarnFormat("{0} Setting appearance on ScenePresence {1} \"{2}\"", LogHeader(), sp.UUID, sp.Name); - m_scene.AvatarFactory.SetAppearance(sp.ControllingClient, te, vp); - } - public void HandleAgentRequestSit(object sender, UUID agentID, UUID targetID, Vector3 offset) { m_log.DebugFormat("{0} HandleAgentRequestSit for {1}", LogHeader(), agentID.ToString()); @@ -1168,7 +1151,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule // Register for interesting client events which will be forwarded to auth sim // These are the raw packet data blocks from the client, intercepted and sent up to the sim client.OnAgentUpdateRaw += HandleAgentUpdateRaw; - client.OnSetAppearanceRaw += HandleSetAppearanceRaw; client.OnChatFromClientRaw += HandleChatFromClientRaw; presence.IsSyncedAvatar = false; } diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 48d3762ec3..beb22afc14 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -62,7 +62,6 @@ namespace OpenSim.Region.Examples.SimpleModule public event ModifyTerrain OnModifyTerrain; public event BakeTerrain OnBakeTerrain; public event SetAppearance OnSetAppearance; - public event SetAppearanceRaw OnSetAppearanceRaw; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv; diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 95ecfb3d5f..c1530f891d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -547,13 +547,13 @@ namespace OpenSim.Region.Framework.Scenes public void LoadPrimsFromStorageInGivenSpace(string regionName, float minX, float minY, float maxX, float maxY) { - m_log.Info("[SCENE]: Loading objects from datastore"); + m_log.InfoFormat("[SCENE ({0})]: Loading objects from datastore", regionName); GridRegion regionInfo = GridService.GetRegionByName(UUID.Zero, regionName); //TODO: need to load objects from the specified space List PrimsFromDB = m_SimulationDataService.LoadObjectsInGivenSpace(regionInfo.RegionID, minX, minY, maxX, maxY); - m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count + " objects from the datastore"); + m_log.InfoFormat("[SCENE ({0})]: Loaded " + PrimsFromDB.Count + " objects from the datastore", regionName); foreach (SceneObjectGroup group in PrimsFromDB) { @@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes group.CheckSculptAndLoad(); //rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); } - m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); + m_log.InfoFormat("[SCENE ({0})]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)", regionName); } //public void ToInformActorsLoadOar() @@ -1277,7 +1277,7 @@ namespace OpenSim.Region.Framework.Scenes // This is the method that shuts down the scene. public override void Close() { - m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName); + m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", m_regionName); m_restartTimer.Stop(); m_restartTimer.Close(); @@ -1304,7 +1304,7 @@ namespace OpenSim.Region.Framework.Scenes //m_heartbeatTimer.Close(); shuttingdown = true; - m_log.Debug("[SCENE]: Persisting changed objects"); + m_log.DebugFormat("[SCENE ({0})]: Persisting changed objects", m_regionName); EntityBase[] entities = GetEntities(); foreach (EntityBase entity in entities) { @@ -2034,7 +2034,7 @@ namespace OpenSim.Region.Framework.Scenes /// Unique Identifier of the Region to load parcel data for public void loadAllLandObjectsFromStorage(UUID regionID) { - m_log.Info("[SCENE]: Loading land objects from storage"); + m_log.InfoFormat("[SCENE ({0})]: Loading land objects from storage", m_regionName); List landData = SimulationDataService.LoadLandObjects(regionID); if (LandChannel != null) @@ -2064,11 +2064,11 @@ namespace OpenSim.Region.Framework.Scenes public virtual void LoadPrimsFromStorage(UUID regionID) { LoadingPrims = true; - m_log.Info("[SCENE]: Loading objects from datastore"); + m_log.InfoFormat("[SCENE ({0})]: Loading objects from datastore", m_regionName); List PrimsFromDB = SimulationDataService.LoadObjects(regionID); - m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count + " objects from the datastore"); + m_log.InfoFormat("[SCENE ({0})]: Loaded " + PrimsFromDB.Count + " objects from the datastore", m_regionName); foreach (SceneObjectGroup group in PrimsFromDB) { @@ -2089,7 +2089,7 @@ namespace OpenSim.Region.Framework.Scenes //rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); } - m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); + m_log.InfoFormat("[SCENE ({0})]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)", m_regionName); LoadingPrims = false; } @@ -2708,7 +2708,7 @@ namespace OpenSim.Region.Framework.Scenes if (!AddSceneObject(newObject)) { - m_log.DebugFormat("[SCENE]: Problem adding scene object {0} in {1} ", sog.UUID, RegionInfo.RegionName); + m_log.DebugFormat("[SCENE ({0})]: Problem adding scene object {1} ", RegionInfo.RegionName, sog.UUID); return false; } @@ -2878,7 +2878,7 @@ namespace OpenSim.Region.Framework.Scenes if (m_restorePresences.ContainsKey(client.AgentId)) { - m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName); + m_log.DebugFormat("[SCENE ({0})]: Restoring agent {1} ({2})", m_regionName, client.Name, client.AgentId); m_clientManager.Add(client); SubscribeToClientEvents(client); @@ -2912,7 +2912,7 @@ namespace OpenSim.Region.Framework.Scenes { if (GetScenePresence(client.AgentId) == null) // ensure there is no SP here { - m_log.Debug("[SCENE]: Adding new agent " + client.Name + " to scene " + RegionInfo.RegionName); + m_log.DebugFormat("[SCENE ({0})]: Adding new agent {1} ({2}) to scene.", m_regionName, client.Name, client.AgentId); m_clientManager.Add(client); SubscribeToClientEvents(client); @@ -2967,8 +2967,8 @@ namespace OpenSim.Region.Framework.Scenes else if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0) { - m_log.DebugFormat("[SCENE]: Incoming client {0} {1} in region {2} via regular login. Client IP verification not performed.", - aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName); + m_log.DebugFormat("[SCENE ({0})]: Incoming client {1} {2} via regular login. Client IP verification not performed.", + m_regionName, aCircuit.firstname, aCircuit.lastname); vialogin = true; } @@ -4080,14 +4080,14 @@ namespace OpenSim.Region.Framework.Scenes } catch (Exception e) { - m_log.ErrorFormat("[SCENE]: Unable to do agent crossing, exception {0}", e); + m_log.ErrorFormat("[SCENE ({0})]: Unable to do agent crossing, exception {1}", m_regionName, e); } } else { m_log.ErrorFormat( - "[SCENE]: Could not find presence for agent {0} crossing into scene {1}", - agentID, RegionInfo.RegionName); + "[SCENE ({0})]: Could not find presence for agent {1} crossing into scene {2}", + m_regionName, agentID, m_regionName); } } @@ -4101,7 +4101,7 @@ namespace OpenSim.Region.Framework.Scenes public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData) { m_log.DebugFormat( - "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName); + "[SCENE ({0})]: Incoming child agent update for {1}", m_regionName, cAgentData.AgentID); // XPTO: if this agent is not allowed here as root, always return false diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 29b6b7ebac..566962580f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -3146,7 +3146,8 @@ namespace OpenSim.Region.Framework.Scenes ClearUpdateSchedule(); //SYMMETRIC SYNC - + if (m_parentGroup.Scene.RegionSyncModule == null) + return; m_parentGroup.Scene.RegionSyncModule.QueueSceneObjectPartForUpdate(this); //end of SYMMETRIC SYNC @@ -4947,6 +4948,8 @@ namespace OpenSim.Region.Framework.Scenes public void SyncInfoUpdate() { + if (m_parentGroup.Scene.ActorSyncModule == null || m_parentGroup.Scene.ActorSyncModule.ActorID == null) + return; //Trick: calling UpdateTimestamp here makes sure that when an object was received and de-serialized, before // its parts are linked together, neither TimeStamp or ActorID will be modified. This is because during de-serialization, // ScheduleFullUpdate() is called when m_parentGroup == null diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9b54fbeed6..8d87dfd142 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes { // ~ScenePresence() // { -// m_log.Debug("[ScenePresence] Destructor called"); +// m_log.Debug("[SCENE PRESENCE] Destructor called"); // } private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -504,7 +504,7 @@ namespace OpenSim.Region.Framework.Scenes } catch (Exception e) { - m_log.Error("[SCENEPRESENCE]: ABSOLUTE POSITION " + e.Message); + m_log.Error("[SCENE PRESENCE]: ABSOLUTE POSITION " + e.Message); } } @@ -544,7 +544,7 @@ namespace OpenSim.Region.Framework.Scenes } catch (Exception e) { - m_log.Error("[SCENEPRESENCE]: VELOCITY " + e.Message); + m_log.Error("[SCENE PRESENCE]: VELOCITY " + e.Message); } } @@ -1002,7 +1002,7 @@ namespace OpenSim.Region.Framework.Scenes Animator.ResetAnimations(); // m_log.DebugFormat( -// "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", +// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", // Name, UUID, m_scene.RegionInfo.RegionName); // Don't zero out the velocity since this can cause problems when an avatar is making a region crossing, @@ -1183,7 +1183,7 @@ namespace OpenSim.Region.Framework.Scenes m_callbackURI = null; } - //m_log.DebugFormat("Completed movement"); + m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); SendInitialData(); @@ -1598,7 +1598,7 @@ namespace OpenSim.Region.Framework.Scenes catch (Exception e) { //Avoid system crash, can be slower but... - m_log.DebugFormat("Crash! {0}", e.ToString()); + m_log.DebugFormat("[SCENE PRESENCE] Crash! {0}", e.ToString()); } } } @@ -1703,7 +1703,7 @@ namespace OpenSim.Region.Framework.Scenes catch (Exception ex) { //Why did I get this error? - m_log.Error("[SCENEPRESENCE]: DoMoveToPosition" + ex); + m_log.Error("[SCENE PRESENCE]: DoMoveToPosition" + ex); } } @@ -2302,7 +2302,7 @@ namespace OpenSim.Region.Framework.Scenes if (m_isChildAgent) { // WHAT??? - m_log.Debug("[SCENEPRESENCE]: AddNewMovement() called on child agent, making root agent!"); + m_log.Debug("[SCENE PRESENCE]: AddNewMovement() called on child agent, making root agent!"); return; } @@ -2417,7 +2417,7 @@ namespace OpenSim.Region.Framework.Scenes Vector3 pos = m_pos; pos.Z += m_appearance.HipOffset; - //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); + //m_log.DebugFormat("[SCENE PRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity); remoteClient.SendPrimUpdate( this, @@ -2476,7 +2476,7 @@ namespace OpenSim.Region.Framework.Scenes /// private void SendInitialData() { - m_log.DebugFormat("[SP] SendInitialData: {0} ({1})", Name, UUID); + m_log.DebugFormat("[SCENE PRESENCE] SendInitialData: {0} ({1})", Name, UUID); // Moved this into CompleteMovement to ensure that m_appearance is initialized before // the inventory arrives // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); @@ -2491,7 +2491,7 @@ namespace OpenSim.Region.Framework.Scenes } else { - m_log.WarnFormat("[SCENEPRESENCE]: AvatarFactory not set for {0}", Name); + m_log.WarnFormat("[SCENE PRESENCE]: AvatarFactory not set for {0}", Name); } // If we aren't using a cached appearance, then clear out the baked textures @@ -2512,7 +2512,7 @@ namespace OpenSim.Region.Framework.Scenes // If we are using the the cached appearance then send it out to everyone if (cachedappearance) { - m_log.InfoFormat("[SCENEPRESENCE]: baked textures are in the cache for {0}", Name); + m_log.InfoFormat("[SCENE PRESENCE]: baked textures are in the cache for {0}", Name); // If the avatars baked textures are all in the cache, then we have a // complete appearance... send it out, if not, then we'll send it when @@ -2527,7 +2527,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void SendAvatarDataToAllAgents() { - m_log.DebugFormat("[SP] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID); + m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAllAgents: {0} ({1})", Name, UUID); // REGION SYNC // The server sends appearance to all client managers since there are no local clients if (m_scene.IsSyncedServer()) @@ -2539,7 +2539,7 @@ namespace OpenSim.Region.Framework.Scenes // only send update from root agents to other clients; children are only "listening posts" if (IsChildAgent) { - m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); + m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); return; } @@ -2593,7 +2593,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void SendAvatarDataToAgent(ScenePresence avatar) { - m_log.DebugFormat("[SP] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); + m_log.DebugFormat("[SCENE PRESENCE] SendAvatarDataToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); avatar.ControllingClient.SendAvatarDataImmediate(this); Animator.SendAnimPackToClient(avatar.ControllingClient); @@ -2605,7 +2605,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void SendAppearanceToAllOtherAgents() { - m_log.DebugFormat("[SP] SendAppearanceToAllOtherAgents: {0} ({1})", Name, UUID); + m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAllOtherAgents: {0} ({1})", Name, UUID); // REGION SYNC // The server should not be doing anything via the ForEachScenePresence method if (m_scene.IsSyncedServer()) @@ -2616,7 +2616,7 @@ namespace OpenSim.Region.Framework.Scenes // only send update from root agents to other clients; children are only "listening posts" if (IsChildAgent) { - m_log.Warn("[SCENEPRESENCE] attempt to send avatar data from a child agent"); + m_log.Warn("[SCENE PRESENCE] attempt to send avatar data from a child agent"); return; } @@ -2642,7 +2642,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void SendOtherAgentsAppearanceToMe() { - m_log.DebugFormat("[SP] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID); + m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID); m_perfMonMS = Util.EnvironmentTickCount(); int count = 0; @@ -2669,7 +2669,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void SendAppearanceToAgent(ScenePresence avatar) { - m_log.DebugFormat("[SP] SendAppearanceToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); + m_log.DebugFormat("[SCENE PRESENCE] SendAppearanceToAgent from {0} ({1}) to {2} ({3})", Name, UUID, avatar.Name, avatar.UUID); avatar.ControllingClient.SendAppearance( m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); @@ -3824,7 +3824,7 @@ namespace OpenSim.Region.Framework.Scenes m_log.WarnFormat("[ATTACHMENT]: Appearance has not been initialized for agent {0}", UUID); return; } - + m_log.DebugFormat("[ATTACHMENT]: Rezzing attachments for scene presence {0} ({1})", Name, UUID); List attachments = m_appearance.GetAttachments(); foreach (AvatarAttachment attach in attachments) { diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 4349b563fd..d5fe72beeb 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs @@ -662,7 +662,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server public event BakeTerrain OnBakeTerrain; public event EstateChangeInfo OnEstateChangeInfo; public event SetAppearance OnSetAppearance; - public event SetAppearanceRaw OnSetAppearanceRaw; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv; diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 80ccf4532f..1f658c4fe7 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs @@ -170,7 +170,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC public event RezObject OnRezObject; public event ModifyTerrain OnModifyTerrain; public event SetAppearance OnSetAppearance; - public event SetAppearanceRaw OnSetAppearanceRaw; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv; diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 32d2003332..bb5425b29e 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs @@ -74,7 +74,6 @@ namespace OpenSim.Tests.Common.Mock public event ModifyTerrain OnModifyTerrain; public event BakeTerrain OnBakeTerrain; public event SetAppearance OnSetAppearance; - public event SetAppearanceRaw OnSetAppearanceRaw; public event AvatarNowWearing OnAvatarNowWearing; public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; public event RezMultipleAttachmentsFromInv OnRezMultipleAttachmentsFromInv;