Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 10 insertions, 8 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
index 33b1f77..45d33cd 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
@@ -57,7 +57,6 @@ namespace OpenSim.Region.ClientStack.Linden
         public bool Enabled { get; private set; }
 
         private Scene m_scene;
-        private UUID m_agentID;
 
         #region ISharedRegionModule Members
 
@@ -118,25 +117,26 @@ namespace OpenSim.Region.ClientStack.Linden
         public void RegisterCaps(UUID agentID, Caps caps)
         {
             IRequestHandler reqHandler
-                = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag, "MeshUploadFlag", agentID.ToString());
+                = new RestHTTPHandler(
+                    "GET", "/CAPS/" + UUID.Random(), ht => MeshUploadFlag(ht, agentID), "MeshUploadFlag", agentID.ToString());
 
             caps.RegisterHandler("MeshUploadFlag", reqHandler);
-                m_agentID = agentID;
+
         }
 
-        private Hashtable MeshUploadFlag(Hashtable mDhttpMethod)
+        private Hashtable MeshUploadFlag(Hashtable mDhttpMethod, UUID agentID)
         {
 //            m_log.DebugFormat("[MESH UPLOAD FLAG MODULE]: MeshUploadFlag request");
 
             OSDMap data = new OSDMap();
-            ScenePresence sp = m_scene.GetScenePresence(m_agentID);
+            ScenePresence sp = m_scene.GetScenePresence(agentID);
             data["username"] = sp.Firstname + "." + sp.Lastname;
             data["display_name_next_update"] = new OSDDate(DateTime.Now);
             data["legacy_first_name"] = sp.Firstname;
             data["mesh_upload_status"] = "valid";
             data["display_name"] = sp.Firstname + " " + sp.Lastname;
             data["legacy_last_name"] = sp.Lastname;
-            data["id"] = m_agentID;
+            data["id"] = agentID;
             data["is_display_name_default"] = true;
 
             //Send back data
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5675870..6742d99 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -790,7 +790,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.ColoName = Utils.EmptyBytes;
             handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
-
+            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
+            
             OutPacket(handshake, ThrottleOutPacketType.Task);
         }
 
@@ -3571,6 +3572,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             avp.Sender.IsTrial = false;
             avp.Sender.ID = agentID;
+            avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0];
             //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
             OutPacket(avp, ThrottleOutPacketType.Task);
         }
@@ -4192,7 +4194,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             pack.Stat = stats.StatsBlock;
 
             pack.Header.Reliable = false;
-
+            pack.RegionInfo = new SimStatsPacket.RegionInfoBlock[0];
             OutPacket(pack, ThrottleOutPacketType.Task);
         }