8 files changed, 318 insertions, 144 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2a0c0b1..ad6b1de 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -124,13 +124,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                     // Save avatar attachment information
                     ScenePresence presence;
-                    if (m_scene.AvatarFactory != null && m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
+                    if (m_scene.AvatarService != null && m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
                     {
                         m_log.Info(
                             "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
                                 + ", AttachmentPoint: " + AttachmentPt);
 
-                        m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+                        m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance);
                     }
                 }
             }
@@ -382,8 +382,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 item = m_scene.InventoryService.GetItem(item);
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
 
-                if (m_scene.AvatarFactory != null)
-                    m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+                if (m_scene.AvatarService != null)
+                    m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance);
             }
         }
 
@@ -405,10 +405,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 presence.Appearance.DetachAttachment(itemID);
 
                 // Save avatar attachment information
-                if (m_scene.AvatarFactory != null)
+                if (m_scene.AvatarService != null)
                 {
                     m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
-                    m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+                    m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance);
                 }
             }
 
@@ -435,9 +435,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 presence.Appearance.DetachAttachment(itemID);
 
-                if (m_scene.AvatarFactory != null)
+                if (m_scene.AvatarService != null)
                 {
-                    m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+                    m_scene.AvatarService.SetAppearance(remoteClient.AgentId, presence.Appearance);
                 }
                 part.ParentGroup.DetachToGround();
 
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 22c8937..5f8b4f6 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -32,58 +32,56 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 
+using System.Threading;
+using System.Timers;
+using System.Collections.Generic;
+
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
-    public class AvatarFactoryModule : IAvatarFactory, IRegionModule
+    public class AvatarFactoryModule : IRegionModule
     {
         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 Scene m_scene = null;
-        private static readonly AvatarAppearance def = new AvatarAppearance();
 
-        public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance)
-        {
-            AvatarData avatar = m_scene.AvatarService.GetAvatar(avatarId);
-            //if ((profile != null) && (profile.RootFolder != null))
-            if (avatar != null)
-            {
-                appearance = avatar.ToAvatarAppearance(avatarId);
-                return true;
-            }
+        private int m_savetime = 5; // seconds to wait before saving changed appearance
+        private int m_sendtime = 2; // seconds to wait before sending changed appearance
 
-            m_log.ErrorFormat("[APPEARANCE]: Appearance not found for {0}, creating default", avatarId);
-            appearance = CreateDefault(avatarId);
-            return false;
-        }
+        private int m_checkTime = 500; // milliseconds to wait between checks for appearance updates
+        private System.Timers.Timer m_updateTimer = new System.Timers.Timer();
+        private Dictionary<UUID,long> m_savequeue = new Dictionary<UUID,long>();
+        private Dictionary<UUID,long> m_sendqueue = new Dictionary<UUID,long>();
 
-        private AvatarAppearance CreateDefault(UUID avatarId)
-        {
-            AvatarAppearance appearance = null;
-            AvatarWearable[] wearables;
-            byte[] visualParams;
-            GetDefaultAvatarAppearance(out wearables, out visualParams);
-            appearance = new AvatarAppearance(avatarId, wearables, visualParams);
-
-            return appearance;
-        }
+        #region RegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(Scene scene, IConfigSource config)
         {
-            scene.RegisterModuleInterface<IAvatarFactory>(this);
             scene.EventManager.OnNewClient += NewClient;
 
-            if (m_scene == null)
+            if (config != null)
             {
-                m_scene = scene;
+                IConfig sconfig = config.Configs["Startup"];
+                if (sconfig != null)
+                {
+                    m_savetime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
+                    m_sendtime = Convert.ToInt32(sconfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
+                }
             }
 
+            if (m_scene == null)
+                m_scene = scene;
         }
 
         public void PostInitialise()
         {
+            m_updateTimer.Enabled = false;
+            m_updateTimer.AutoReset = true;
+            m_updateTimer.Interval = m_checkTime; // 500 milliseconds wait to start async ops
+            m_updateTimer.Elapsed += new ElapsedEventHandler(HandleAppearanceUpdateTimer);
         }
 
         public void Close()
@@ -102,6 +100,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         public void NewClient(IClientAPI client)
         {
+            client.OnRequestWearables += SendWearables;
+            client.OnSetAppearance += SetAppearance;
             client.OnAvatarNowWearing += AvatarIsWearing;
         }
 
@@ -110,42 +110,211 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // client.OnAvatarNowWearing -= AvatarIsWearing;
         }
 
-        public void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance)
+        #endregion
+
+        /// <summary>
+        /// Set appearance data (textureentry and slider settings) received from the client
+        /// </summary>
+        /// <param name="texture"></param>
+        /// <param name="visualParam"></param>
+        public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams)
         {
-            IInventoryService invService = m_scene.InventoryService;
+// DEBUG ON
+            m_log.WarnFormat("[AVFACTORY] SetAppearance for {0}",client.AgentId);
+// DEBUG OFF
 
-            if (invService.GetRootFolder(userID) != null)
+            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+            if (sp == null)
             {
-                for (int i = 0; i < 13; i++)
+                m_log.WarnFormat("[AVFACTORY] SetAppearance unable to find presence for {0}",client.AgentId);
+                return;
+            }
+            
+            bool changed = false;
+            
+            // Process the texture entry
+            if (textureEntry != null)
+            {
+                changed = sp.Appearance.SetTextureEntries(textureEntry);
+
+                for (int i = 0; i < BAKE_INDICES.Length; i++)
                 {
-                    if (appearance.Wearables[i].ItemID == UUID.Zero)
+                    int idx = BAKE_INDICES[i];
+                    Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+                    if (face != null && face.TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                        Util.FireAndForget(delegate(object o) { CheckBakedTextureAssets(client,face.TextureID,idx); });
+                }
+            }
+            
+            // Process the visual params, this may change height as well
+            if (visualParams != null)
+            {
+                if (sp.Appearance.SetVisualParams(visualParams))
+                {
+                    changed = true;
+                    if (sp.Appearance.AvatarHeight > 0)
+                        sp.SetHeight(sp.Appearance.AvatarHeight);
+                }
+            }
+            
+            // If something changed in the appearance then queue an appearance save
+            if (changed)
+                QueueAppearanceSave(client.AgentId);
+
+            // And always queue up an appearance update to send out
+            QueueAppearanceSend(client.AgentId);
+            
+            // Send the appearance back to the avatar
+            AvatarAppearance avp = sp.Appearance;
+            sp.ControllingClient.SendAvatarDataImmediate(sp);
+            sp.ControllingClient.SendAppearance(avp.Owner,avp.VisualParams,avp.Texture.GetBytes());
+        }
+
+        /// <summary>
+        /// Checks for the existance of a baked texture asset and
+        /// requests the viewer rebake if the asset is not found
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="textureID"></param>
+        /// <param name="idx"></param>
+        private void CheckBakedTextureAssets(IClientAPI client, UUID textureID, int idx)
+        {
+            if (m_scene.AssetService.Get(textureID.ToString()) == null)
+            {
+                m_log.WarnFormat("[AVFACTORY]: Missing baked texture {0} ({1}) for avatar {2}",
+                                 textureID,idx,client.Name);
+                client.SendRebakeAvatarTextures(textureID);
+            }
+        }
+        
+        #region UpdateAppearanceTimer
+
+        public void QueueAppearanceSend(UUID agentid)
+        {
+// DEBUG ON
+            m_log.WarnFormat("[AVFACTORY] Queue appearance send for {0}",agentid);
+// DEBUG OFF                
+
+            // 100 nanoseconds (ticks) we should wait
+            long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000); 
+            lock (m_sendqueue)
+            {
+                m_sendqueue[agentid] = timestamp;
+                m_updateTimer.Start();
+            }
+        }
+        
+        public void QueueAppearanceSave(UUID agentid)
+        {
+// DEBUG ON
+            m_log.WarnFormat("[AVFACTORY] Queue appearance save for {0}",agentid);
+// DEBUG OFF                
+
+            // 100 nanoseconds (ticks) we should wait
+            long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000); 
+            lock (m_savequeue)
+            {
+                m_savequeue[agentid] = timestamp;
+                m_updateTimer.Start();
+            }
+        }
+        
+        private void HandleAppearanceSend(UUID agentid)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(agentid);
+            if (sp == null)
+            {
+                m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid);
+                return;
+            }
+
+// DEBUG ON
+            m_log.WarnFormat("[AVFACTORY] Handle appearance send for {0}\n{1}",agentid,sp.Appearance.ToString());
+// DEBUG OFF                
+
+            // Send the appearance to everyone in the scene
+            sp.SendAppearanceToAllOtherAgents();
+
+            // Send the appearance back to the avatar
+            AvatarAppearance avp = sp.Appearance;
+            sp.ControllingClient.SendAvatarDataImmediate(sp);
+            sp.ControllingClient.SendAppearance(avp.Owner,avp.VisualParams,avp.Texture.GetBytes());
+
+/*
+//  this needs to be fixed, the flag should be on scene presence not the region module
+            // Start the animations if necessary
+            if (!m_startAnimationSet)
+            {
+                sp.Animator.UpdateMovementAnimations();
+                m_startAnimationSet = true;
+            }
+*/
+        }
+
+        private void HandleAppearanceSave(UUID agentid)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(agentid);
+            if (sp == null)
+            {
+                m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid);
+                return;
+            }
+
+            m_scene.AvatarService.SetAppearance(agentid, sp.Appearance);
+        }
+
+        private void HandleAppearanceUpdateTimer(object sender, EventArgs ea)
+        {
+            long now = DateTime.Now.Ticks;
+            
+            lock (m_sendqueue)
+            {
+                Dictionary<UUID,long> sends = new Dictionary<UUID,long>(m_sendqueue);
+                foreach (KeyValuePair<UUID,long> kvp in sends)
+                {
+                    if (kvp.Value < now)
                     {
-                        appearance.Wearables[i].AssetID = UUID.Zero;
+                        Util.FireAndForget(delegate(object o) { HandleAppearanceSend(kvp.Key); });
+                        m_sendqueue.Remove(kvp.Key);
                     }
-                    else
-                    {
-                        InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i].ItemID, userID);
-                        baseItem = invService.GetItem(baseItem);
+                }
+            }
 
-                        if (baseItem != null)
-                        {
-                            appearance.Wearables[i].AssetID = baseItem.AssetID;
-                        }
-                        else
-                        {
-                            m_log.ErrorFormat(
-                                "[APPEARANCE]: Can't find inventory item {0} for {1}, setting to default", 
-                                appearance.Wearables[i].ItemID, (WearableType)i);
-                            
-                            appearance.Wearables[i].AssetID = def.Wearables[i].AssetID;
-                        }
+            lock (m_savequeue)
+            {
+                Dictionary<UUID,long> saves = new Dictionary<UUID,long>(m_savequeue);
+                foreach (KeyValuePair<UUID,long> kvp in saves)
+                {
+                    if (kvp.Value < now)
+                    {
+                        Util.FireAndForget(delegate(object o) { HandleAppearanceSave(kvp.Key); });
+                        m_savequeue.Remove(kvp.Key);
                     }
                 }
             }
-            else
+
+            if (m_savequeue.Count == 0 && m_sendqueue.Count == 0)
+                m_updateTimer.Stop();
+        }
+        
+        #endregion
+
+        /// <summary>
+        /// Tell the client for this scene presence what items it should be wearing now
+        /// </summary>
+        public void SendWearables(IClientAPI client)
+        {
+            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+            if (sp == null)
             {
-                m_log.WarnFormat("[APPEARANCE]: user {0} has no inventory, appearance isn't going to work", userID);
+                m_log.WarnFormat("[AVFACTORY] SendWearables unable to find presence for {0}",client.AgentId);
+                return;
             }
+            
+// DEBUG ON
+            m_log.WarnFormat("[AVFACTORY]: Received request for wearables of {0}", client.AgentId);
+// DEBUG OFF            
+            client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++);
         }
 
         /// <summary>
@@ -153,65 +322,81 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        public void AvatarIsWearing(Object sender, AvatarWearingArgs e)
+        public void AvatarIsWearing(IClientAPI client, AvatarWearingArgs e)
         {
-            m_log.DebugFormat("[APPEARANCE]: AvatarIsWearing");
-
-            IClientAPI clientView = (IClientAPI)sender;
-            ScenePresence sp = m_scene.GetScenePresence(clientView.AgentId);
-            
-            if (sp == null) 
+            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+            if (sp == null)
             {
-                m_log.Error("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event");
+                m_log.WarnFormat("[AVFACTORY] AvatarIsWearing unable to find presence for {0}",client.AgentId);
                 return;
             }
+            
+// DEBUG ON
+            m_log.WarnFormat("[AVFACTORY]: AvatarIsWearing called for {0}",client.AgentId);
+// DEBUG OFF
+
+            AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance);
 
-            AvatarAppearance avatAppearance = sp.Appearance;
-            //if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) 
+            //if (!TryGetAvatarAppearance(client.AgentId, out avatAppearance)) 
             //{
-            //    m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
+            //    m_log.Warn("[AVFACTORY]: We didn't seem to find the appearance, falling back to ScenePresence");
             //    avatAppearance = sp.Appearance;
             //}
             
-            //m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
+            //m_log.DebugFormat("[AVFACTORY]: Received wearables for {0}", client.Name);
             
             foreach (AvatarWearingArgs.Wearable wear in e.NowWearing)
             {
-                if (wear.Type < 13)
+                if (wear.Type < AvatarWearable.MAX_WEARABLES)
                 {
-                    avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
+                    AvatarWearable newWearable = new AvatarWearable(wear.ItemID,UUID.Zero);
+                    avatAppearance.SetWearable(wear.Type, newWearable);
                 }
             }
             
             SetAppearanceAssets(sp.UUID, ref avatAppearance);
-            AvatarData adata = new AvatarData(avatAppearance);
-            m_scene.AvatarService.SetAvatar(clientView.AgentId, adata);
 
+            m_scene.AvatarService.SetAppearance(client.AgentId, avatAppearance);
             sp.Appearance = avatAppearance;
         }
 
-        public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
+        private void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance)
         {
-            visualParams = GetDefaultVisualParams();
-            wearables = AvatarWearable.DefaultWearables;
-        }
+            IInventoryService invService = m_scene.InventoryService;
 
-        public void UpdateDatabase(UUID user, AvatarAppearance appearance)
-        {
-            //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
-            AvatarData adata = new AvatarData(appearance);
-            m_scene.AvatarService.SetAvatar(user, adata);
-        }
+            if (invService.GetRootFolder(userID) != null)
+            {
+                for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
+                {
+                    if (appearance.Wearables[i].ItemID == UUID.Zero)
+                    {
+                        appearance.Wearables[i].AssetID = UUID.Zero;
+                    }
+                    else
+                    {
+                        InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i].ItemID, userID);
+                        baseItem = invService.GetItem(baseItem);
 
-        private static byte[] GetDefaultVisualParams()
-        {
-            byte[] visualParams;
-            visualParams = new byte[218];
-            for (int i = 0; i < 218; i++)
+                        if (baseItem != null)
+                        {
+                            appearance.Wearables[i].AssetID = baseItem.AssetID;
+                        }
+                        else
+                        {
+                            m_log.ErrorFormat(
+                                "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default", 
+                                appearance.Wearables[i].ItemID, (WearableType)i);
+                            
+                            appearance.Wearables[i].ItemID = UUID.Zero;
+                            appearance.Wearables[i].AssetID = UUID.Zero;
+                        }
+                    }
+                }
+            }
+            else
             {
-                visualParams[i] = 100;
+                m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID);
             }
-            return visualParams;
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 918fa04..fdc48c6 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -599,7 +599,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             try
             {
 
-                XmlRpcResponse GridResp = GridReq.Send("http://" + reginfo.ExternalHostName + ":" + reginfo.HttpPort, 3000);
+                XmlRpcResponse GridResp = GridReq.Send(reginfo.ServerURI, 3000);
 
                 Hashtable responseData = (Hashtable)GridResp.Value;
 
@@ -621,8 +621,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             }
             catch (WebException e)
             {
-                m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to http://{0}:{1} the host didn't respond ({2})", 
-                                  reginfo.ExternalHostName, reginfo.HttpPort, e.Message);
+                m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0}} the host didn't respond ({2})", 
+                                  reginfo.ServerURI, e.Message);
             }
 
             return false;
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 38fff1c..925af3f 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -197,8 +197,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             sp.ControllingClient.SendTeleportFailed("Problem at destination");
                             return;
                         }
-                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}",
-                            finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID);
+                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} {2}@{3}",
+                            finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID, finalDestination.ServerURI);
 
                         // Check that these are not the same coordinates
                         if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX &&
@@ -254,8 +254,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Request Teleport to {0}:{1}:{2}/{3}",
-                reg.ExternalHostName, reg.HttpPort, finalDestination.RegionName, position);
+                "[ENTITY TRANSFER MODULE]: Request Teleport to {0} ({1}) {2}/{3}",
+                reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
 
             uint newRegionX = (uint)(reg.RegionHandle >> 40);
             uint newRegionY = (((uint)(reg.RegionHandle)) >> 8);
@@ -327,43 +327,21 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 // OK, it got this agent. Let's close some child agents
                 sp.CloseChildAgents(newRegionX, newRegionY);
-
+                IClientIPEndpoint ipepClient;  
                 if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY))
                 {
                     //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
-
                     #region IP Translation for NAT
-                    IClientIPEndpoint ipepClient;
+                    // Uses ipepClient above
                     if (sp.ClientView.TryGet(out ipepClient))
                     {
-                        capsPath
-                            = "http://"
-                              + NetworkUtil.GetHostFor(ipepClient.EndPoint, finalDestination.ExternalHostName)
-                              + ":"
-                              + finalDestination.HttpPort
-                              + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
-                    }
-                    else
-                    {
-                        capsPath
-                            = "http://"
-                              + finalDestination.ExternalHostName
-                              + ":"
-                              + finalDestination.HttpPort
-                              + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+                        endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
                     }
                     #endregion
+                    capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
 
                     if (eq != null)
                     {
-                        #region IP Translation for NAT
-                        // Uses ipepClient above
-                        if (sp.ClientView.TryGet(out ipepClient))
-                        {
-                            endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
-                        }
-                        #endregion
-
                         eq.EnableSimulator(destinationHandle, endPoint, sp.UUID);
 
                         // ES makes the client send a UseCircuitCode message to the destination, 
@@ -382,8 +360,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 else
                 {
                     agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
-                    capsPath = "http://" + finalDestination.ExternalHostName + ":" + finalDestination.HttpPort
-                                + "/CAPS/" + agentCircuit.CapsPath + "0000/";
+                    capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
                 }
 
                 // Expect avatar crossing is a heavy-duty function at the destination.
@@ -516,8 +493,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected virtual void SetCallbackURL(AgentData agent, RegionInfo region)
         {
-            agent.CallbackURI = "http://" + region.ExternalHostName + ":" + region.HttpPort +
-                "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/";
+            agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/";
+            m_log.Debug("Set callback URL to " + agent.CallbackURI);
 
         }
 
@@ -842,8 +819,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 cAgent.Position = pos;
                 if (isFlying)
                     cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
-                cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort +
-                    "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/";
+                cAgent.CallbackURI = m_scene.RegionInfo.ServerURI +
+                    "agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/";
 
                 if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent))
                 {
@@ -868,10 +845,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                      neighbourRegion.RegionHandle);
                     return agent;
                 }
-                // TODO Should construct this behind a method
-                string capsPath =
-                    "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort
-                     + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/";
+                string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
 
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
 
@@ -1190,8 +1164,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             y = y / Constants.RegionSize;
             m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")");
 
-            string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort
-                  + "/CAPS/" + a.CapsPath + "0000/";
+            string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath);
 
             string reason = String.Empty;
 
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 1ac7508..7796a08 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -123,7 +123,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
             {
                 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID);
-                return m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
+                GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
+                m_log.Debug("GetfinalDestination serveruri -> " + real_destination.ServerURI);
+                return real_destination;
             }
             return region;
         }
@@ -149,6 +151,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout)
         {
+            m_log.Debug("CreateAgent " + reg.ServerURI + " " + finalDestination.ServerURI);
             reason = string.Empty;
             logout = false;
             int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID);
@@ -235,6 +238,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
                 IUserAgentService security = new UserAgentServiceConnector(url);
                 return security.VerifyClient(aCircuit.SessionID, token);
+            } else {
+                m_log.Debug("this gent does not have a HomeURI OH NO");
             }
 
             return false;
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index fd0e879..2dd7767 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -595,12 +595,12 @@ namespace OpenSim.Region.CoreModules.InterGrid
             // DEPRECATED
             responseMap["seed_capability"] 
                 = OSD.FromString(
-                    regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
+                    regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
             
             // REPLACEMENT
             responseMap["region_seed_capability"] 
                 = OSD.FromString(
-                    regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
+                    regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
 
             responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
             responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
index 47f19a3..9ee19f8 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Nini.Config;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Server.Base;
@@ -137,6 +138,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
 
         #region IAvatarService
 
+        public AvatarAppearance GetAppearance(UUID userID)
+        {
+            return m_AvatarService.GetAppearance(userID);
+        }
+        
+        public bool SetAppearance(UUID userID, AvatarAppearance appearance)
+        {
+            return m_AvatarService.SetAppearance(userID,appearance);
+        }
+            
         public AvatarData GetAvatar(UUID userID)
         {
             return m_AvatarService.GetAvatar(userID);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index a182eea..fdbbccf 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
             regionimage = regionimage.Replace("-", "");
-            m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage);
+            m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "/index.php?method=" + regionimage);
 
             MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
             MainServer.Instance.AddLLSDHandler(
@@ -579,7 +579,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                 if (mreg != null)
                 {
-                    httpserver = "http://" + mreg.ExternalEndPoint.Address.ToString() + ":" + mreg.HttpPort + "/MAP/MapItems/" + regionhandle.ToString();
+                    httpserver = mreg.ServerURI + "MAP/MapItems/" + regionhandle.ToString();
                     lock (m_cachedRegionMapItemsAddress)
                     {
                         if (!m_cachedRegionMapItemsAddress.ContainsKey(regionhandle))