Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance

2 files changed, 50 insertions, 122 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c9ae558..6ed08f3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -119,7 +119,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected IXMLRPC m_xmlrpcModule;
         protected IWorldComm m_worldCommModule;
-        protected IAvatarFactory m_AvatarFactory;
         protected IConfigSource m_config;
         protected IRegionSerialiserModule m_serialiser;
         protected IDialogModule m_dialogModule;
@@ -399,11 +398,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public IAttachmentsModule AttachmentsModule { get; set; }
 
-        public IAvatarFactory AvatarFactory
-        {
-            get { return m_AvatarFactory; }
-        }
-
         public ICapabilitiesModule CapsModule
         {
             get { return m_capsModule; }
@@ -1159,7 +1153,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_xmlrpcModule = RequestModuleInterface<IXMLRPC>();
             m_worldCommModule = RequestModuleInterface<IWorldComm>();
             XferManager = RequestModuleInterface<IXfer>();
-            m_AvatarFactory = RequestModuleInterface<IAvatarFactory>();
             AttachmentsModule = RequestModuleInterface<IAttachmentsModule>();
             m_serialiser = RequestModuleInterface<IRegionSerialiserModule>();
             m_dialogModule = RequestModuleInterface<IDialogModule>();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c223b4b..8541121 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
 //        private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes();
         private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags));
         private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f);
@@ -137,8 +136,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         private SendCourseLocationsMethod m_sendCourseLocationsMethod;
 
-        private bool m_startAnimationSet;
-
         //private Vector3 m_requestedSitOffset = new Vector3();
 
         private Vector3 m_LastFinitePos;
@@ -713,13 +710,14 @@ namespace OpenSim.Region.Framework.Scenes
             SetDirectionVectors();
         }
 
+/*
         public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, byte[] visualParams,
                              AvatarWearable[] wearables)
             : this(client, world, reginfo)
         {
             m_appearance = new AvatarAppearance(m_uuid, wearables, visualParams);
         }
-
+*/
         public ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance)
             : this(client, world, reginfo)
         {
@@ -733,8 +731,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void RegisterToEvents()
         {
-            m_controllingClient.OnRequestWearables += SendWearables;
-            m_controllingClient.OnSetAppearance += SetAppearance;
             m_controllingClient.OnCompleteMovementToRegion += CompleteMovement;
             //m_controllingClient.OnCompleteMovementToRegion += SendInitialData;
             m_controllingClient.OnAgentUpdate += HandleAgentUpdate;
@@ -1068,7 +1064,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Sets avatar height in the phyiscs plugin
         /// </summary>
-        internal void SetHeight(float height)
+        public void SetHeight(float height)
         {
             m_avHeight = height;
             if (PhysicsActor != null && !IsChildAgent)
@@ -1133,7 +1129,6 @@ namespace OpenSim.Region.Framework.Scenes
                 if (friendsModule != null)
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
             }
-
         }
 
         /// <summary>
@@ -2392,9 +2387,12 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_appearance.Texture == null)
                 return;
 
-            Vector3 pos = m_pos;
-            pos.Z += m_appearance.HipOffset;
-
+            if (IsChildAgent)
+            {
+                m_log.WarnFormat("[SCENEPRESENCE] A child agent is attempting to send out avatar data");
+                return;
+            }
+            
             remoteAvatar.m_controllingClient.SendAvatarDataImmediate(this);
             m_scene.StatsReporter.AddAgentUpdates(1);
         }
@@ -2437,6 +2435,12 @@ namespace OpenSim.Region.Framework.Scenes
             m_perfMonMS = Util.EnvironmentTickCount();
 
             // only send update from root agents to other clients; children are only "listening posts"
+            if (IsChildAgent)
+            {
+                m_log.Warn("[SCENEPRESENCE] attempt to send update from a childagent");
+                return;
+            }
+            
             int count = 0;
             m_scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
@@ -2460,29 +2464,20 @@ namespace OpenSim.Region.Framework.Scenes
             // the inventory arrives
             // m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
 
-            Vector3 pos = m_pos;
-            pos.Z += m_appearance.HipOffset;
-
             m_controllingClient.SendAvatarDataImmediate(this);
+            m_controllingClient.SendAppearance(m_appearance.Owner,m_appearance.VisualParams,m_appearance.Texture.GetBytes());
 
             SendInitialFullUpdateToAllClients();
         }
 
         /// <summary>
-        /// Tell the client for this scene presence what items it should be wearing now
-        /// </summary>
-        public void SendWearables()
-        {
-            m_log.DebugFormat("[SCENE]: Received request for wearables of {0}", Name);
-            
-            ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
-        }
-
-        /// <summary>
         ///
         /// </summary>
         public void SendAppearanceToAllOtherAgents()
         {
+// DEBUG ON
+            m_log.WarnFormat("[SP] Send appearance from {0} to all other agents",m_uuid);
+// DEBUG OFF
             m_perfMonMS = Util.EnvironmentTickCount();
 
             m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
@@ -2502,87 +2497,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="avatar"></param>
         public void SendAppearanceToOtherAgent(ScenePresence avatar)
         {
+// DEBUG ON
+            m_log.WarnFormat("[SP] Send appearance from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId);
+// DEBUG OFF
             avatar.ControllingClient.SendAppearance(
                 m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes());
         }
 
-        /// <summary>
-        /// Set appearance data (textureentry and slider settings) received from the client
-        /// </summary>
-        /// <param name="texture"></param>
-        /// <param name="visualParam"></param>
-        public void SetAppearance(Primitive.TextureEntry textureEntry, byte[] visualParams)
-        {
-            if (m_physicsActor != null)
-            {
-                if (!IsChildAgent)
-                {
-                    // This may seem like it's redundant, remove the avatar from the physics scene
-                    // just to add it back again, but it saves us from having to update
-                    // 3 variables 10 times a second.
-                    bool flyingTemp = m_physicsActor.Flying;
-                    RemoveFromPhysicalScene();
-                    //m_scene.PhysicsScene.RemoveAvatar(m_physicsActor);
-
-                    //PhysicsActor = null;
-
-                    AddToPhysicalScene(flyingTemp);
-                }
-            }
-
-            #region Bake Cache Check
-
-            if (textureEntry != null)
-            {
-                for (int i = 0; i < BAKE_INDICES.Length; i++)
-                {
-                    int j = BAKE_INDICES[i];
-                    Primitive.TextureEntryFace face = textureEntry.FaceTextures[j];
-
-                    if (face != null && face.TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
-                    {
-                        if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
-                        {
-                            m_log.Warn("[APPEARANCE]: Missing baked texture " + face.TextureID + " (" + j + ") for avatar " + this.Name);
-                            this.ControllingClient.SendRebakeAvatarTextures(face.TextureID);
-                        }
-                    }
-                }
-
-            }
-
-
-            #endregion Bake Cache Check
-
-            m_appearance.SetAppearance(textureEntry, visualParams);
-            if (m_appearance.AvatarHeight > 0)
-                SetHeight(m_appearance.AvatarHeight);
-
-            // This is not needed, because only the transient data changed
-            //AvatarData adata = new AvatarData(m_appearance);
-            //m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
-
-            SendAppearanceToAllOtherAgents();
-            if (!m_startAnimationSet)
-            {
-                Animator.UpdateMovementAnimations();
-                m_startAnimationSet = true;
-            }
-
-            Vector3 pos = m_pos;
-            pos.Z += m_appearance.HipOffset;
-
-            m_controllingClient.SendAvatarDataImmediate(this);
-        }
-
-        public void SetWearable(int wearableId, AvatarWearable wearable)
-        {
-            m_appearance.SetWearable(wearableId, wearable);
-            AvatarData adata = new AvatarData(m_appearance);
-            m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata);
-            m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
-        }
-
         // Because appearance setting is in a module, we actually need
         // to give it access to our appearance directly, otherwise we
         // get a synchronization issue.
@@ -2976,8 +2897,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void CopyTo(AgentData cAgent)
         {
+// DEBUG ON
+            m_log.ErrorFormat("[SCENEPRESENCE] CALLING COPYTO");
+// DEBUG OFF
             cAgent.CallbackURI = m_callbackURI;
-            
+
             cAgent.AgentID = UUID;
             cAgent.RegionID = Scene.RegionInfo.RegionID;
 
@@ -3017,6 +2941,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             cAgent.AlwaysRun = m_setAlwaysRun;
 
+            cAgent.Appearance = new AvatarAppearance(m_appearance);
+            
+/*
             try
             {
                 // We might not pass the Wearables in all cases...
@@ -3056,14 +2983,14 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 //m_log.DebugFormat("[SCENE PRESENCE]: attachments {0}", attPoints.Count);
                 int i = 0;
-                AttachmentData[] attachs = new AttachmentData[attPoints.Count];
+                AvatarAttachment[] attachs = new AvatarAttachment[attPoints.Count];
                 foreach (int point in attPoints)
                 {
-                    attachs[i++] = new AttachmentData(point, m_appearance.GetAttachedItem(point), m_appearance.GetAttachedAsset(point));
+                    attachs[i++] = new AvatarAttachment(point, m_appearance.GetAttachedItem(point), m_appearance.GetAttachedAsset(point));
                 }
                 cAgent.Attachments = attachs;
             }
-
+*/
             lock (scriptedcontrols)
             {
                 ControllerData[] controls = new ControllerData[scriptedcontrols.Count];
@@ -3090,6 +3017,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void CopyFrom(AgentData cAgent)
         {
+// DEBUG ON
+            m_log.ErrorFormat("[SCENEPRESENCE] CALLING COPYFROM");
+// DEBUG OFF
             m_originRegionID = cAgent.RegionID;
 
             m_callbackURI = cAgent.CallbackURI;
@@ -3115,6 +3045,9 @@ namespace OpenSim.Region.Framework.Scenes
                 m_godLevel = cAgent.GodLevel;
             m_setAlwaysRun = cAgent.AlwaysRun;
 
+            m_appearance = new AvatarAppearance(cAgent.Appearance);
+            
+/*
             uint i = 0;
             try
             {
@@ -3127,15 +3060,17 @@ namespace OpenSim.Region.Framework.Scenes
                     UUID assetId = cAgent.Wearables[n + 1];
                     wears[i++] = new AvatarWearable(itemId, assetId);
                 }
-                m_appearance.Wearables = wears;
-                Primitive.TextureEntry te;
+                // m_appearance.Wearables = wears;
+                Primitive.TextureEntry textures = null;
                 if (cAgent.AgentTextures != null && cAgent.AgentTextures.Length > 1)
-                    te = new Primitive.TextureEntry(cAgent.AgentTextures, 0, cAgent.AgentTextures.Length);
-                else
-                    te = AvatarAppearance.GetDefaultTexture();
-                if ((cAgent.VisualParams == null) || (cAgent.VisualParams.Length < AvatarAppearance.VISUALPARAM_COUNT))
-                    cAgent.VisualParams = AvatarAppearance.GetDefaultVisualParams();
-                m_appearance.SetAppearance(te, (byte[])cAgent.VisualParams.Clone());
+                    textures = new Primitive.TextureEntry(cAgent.AgentTextures, 0, cAgent.AgentTextures.Length);
+
+                byte[] visuals = null;
+
+                if ((cAgent.VisualParams != null) && (cAgent.VisualParams.Length < AvatarAppearance.VISUALPARAM_COUNT))
+                    visuals = (byte[])cAgent.VisualParams.Clone();
+
+                m_appearance = new AvatarAppearance(cAgent.AgentID,wears,textures,visuals);
             }
             catch (Exception e)
             {
@@ -3148,14 +3083,14 @@ namespace OpenSim.Region.Framework.Scenes
                 if (cAgent.Attachments != null)
                 {
                     m_appearance.ClearAttachments();
-                    foreach (AttachmentData att in cAgent.Attachments)
+                    foreach (AvatarAttachment att in cAgent.Attachments)
                     {
                         m_appearance.SetAttachment(att.AttachPoint, att.ItemID, att.AssetID);
                     }
                 }
             }
             catch { } 
-
+*/
             try
             {
                 lock (scriptedcontrols)