9 files changed, 947 insertions, 889 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 47988dd..50e9275 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -96,9 +96,7 @@ namespace OpenSim.Region.ClientStack.Linden
            s.EventManager.OnRemovePresence -= DeRegisterPresence;
            m_BakedTextureModule = null;
            m_scene = null;
-        }
+        }     
-       
        public void RegionLoaded(Scene s)
        {
@@ -110,44 +108,58 @@ namespace OpenSim.Region.ClientStack.Linden
        private void DeRegisterPresence(UUID agentId)
        {
-            ScenePresence presence = null;
+//            ScenePresence presence = null;
-            if (m_scene.TryGetScenePresence(agentId, out presence))
+//            if (m_scene.TryGetScenePresence(agentId, out presence))
            {
-                presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
+//                presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
            }
        }
        private void RegisterNewPresence(ScenePresence presence)
        {
-           presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings;
+//           presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings;
        }
-        private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
+/* not in use. work done in AvatarFactoryModule ValidateBakedTextureCache() and UpdateBakedTextureCache()
-        {
+                private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
-            int maxCacheitemsLoop = cacheItems.Length;
-            if (maxCacheitemsLoop > AvatarWearable.MAX_WEARABLES)
-            {
-                maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES;
-                m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}.  Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES);
-            }
-            m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            if (cacheItems.Length > 0)
-            {
-                m_log.Debug("[Cacheitems]: " + cacheItems.Length);
-                for (int iter = 0; iter < maxCacheitemsLoop; iter++)
-                {
-                    m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
-                                      cacheItems[iter].TextureID);
-                }
-               
-                ScenePresence p = null;
-                if (m_scene.TryGetScenePresence(remoteClient.AgentId, out p))
                {
+                    // if cacheItems.Length > 0 viewer is giving us current textures information.
+                    // baked ones should had been uploaded and in assets cache as local itens
+                    if (cacheItems.Length == 0)
+                        return;  // no textures information, nothing to do
+                    ScenePresence p = null;
+                    if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out p))
+                        return; // what are we doing if there is no presence to cache for?
+                    if (p.IsDeleted)
+                        return; // does this really work?
+                    int maxCacheitemsLoop = cacheItems.Length;
+                    if (maxCacheitemsLoop > 20)
+                    {
+                        maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES;
+                        m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}.  Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES);
+                    }
+                    m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+                    // some nice debug
+                    m_log.Debug("[Cacheitems]: " + cacheItems.Length);
+                    for (int iter = 0; iter < maxCacheitemsLoop; iter++)
+                    {
+                        m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
+                                          cacheItems[iter].TextureID);
+                    }
+                    // p.Appearance.WearableCacheItems is in memory primary cashID to textures mapper
                    WearableCacheItem[] existingitems = p.Appearance.WearableCacheItems;
                    if (existingitems == null)
                    {
                        if (m_BakedTextureModule != null)
@@ -161,38 +173,22 @@ namespace OpenSim.Region.ClientStack.Linden
                                    p.Appearance.WearableCacheItems = savedcache;
                                    p.Appearance.WearableCacheItemsDirty = false;
                                }
                            }
-                            /*
-                             * The following Catch types DO NOT WORK with m_BakedTextureModule.Get
-                             * it jumps to the General Packet Exception Handler if you don't catch Exception!
-                             * 
-                            catch (System.Net.Sockets.SocketException)
-                            {
-                                cacheItems = null;
-                            }
-                            catch (WebException)
-                            {
-                                cacheItems = null;
-                            }
-                            catch (InvalidOperationException)
-                            {
-                                cacheItems = null;
-                            } */
                            catch (Exception)
                            {
-                               // The service logs a sufficient error message.
+                                // The service logs a sufficient error message.
                            }
-                            
                            if (savedcache != null)
                                existingitems = savedcache;
                        }
                    }
                    // Existing items null means it's a fully new appearance
                    if (existingitems == null)
                    {
                        for (int i = 0; i < maxCacheitemsLoop; i++)
                        {
                            if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
@@ -205,7 +201,7 @@ namespace OpenSim.Region.ClientStack.Linden
                                        AppearanceManager.DEFAULT_AVATAR_TEXTURE;
                                    continue;
                                }
-                                cacheItems[i].TextureID =face.TextureID;
+                                cacheItems[i].TextureID = face.TextureID;
                                if (m_scene.AssetService != null)
                                    cacheItems[i].TextureAsset =
                                        m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
@@ -214,15 +210,10 @@ namespace OpenSim.Region.ClientStack.Linden
                            {
                                m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}.  Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
                            }
                        }
                    }
                    else
+                    {               
-                    {
-                        // for each uploaded baked texture
                        for (int i = 0; i < maxCacheitemsLoop; i++)
                        {
                            if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
@@ -253,23 +244,24 @@ namespace OpenSim.Region.ClientStack.Linden
                            }
                        }
                    }
                    p.Appearance.WearableCacheItems = cacheItems;
-                    
-                   
                    if (m_BakedTextureModule != null)
                    {
                        m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems);
                        p.Appearance.WearableCacheItemsDirty = true;
-                        
                    }
-                }
+                    else
-            }
+                        p.Appearance.WearableCacheItemsDirty = false;
-        }
+                    for (int iter = 0; iter < maxCacheitemsLoop; iter++)
+                    {
+                        m_log.Debug("[CacheitemsLeaving] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
+                                          cacheItems[iter].TextureID);
+                    }
+                }
+        */
        public void PostInitialise()
        {
        }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 34a2797..e9a087b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3684,6 +3684,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            avp.Sender.IsTrial = false;
            avp.Sender.ID = agentID;
            avp.AppearanceData = new AvatarAppearancePacket.AppearanceDataBlock[0];
+            // this need be use in future
+ //           avp.AppearanceData[0].AppearanceVersion = 0;
+ //           avp.AppearanceData[0].CofVersion = 0;
            //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString());
            OutPacket(avp, ThrottleOutPacketType.Task);
        }
@@ -6535,7 +6540,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                    
                    WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length];
                    for (int i=0; i<appear.WearableData.Length;i++)
-                        cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)};
+                        cacheitems[i] = new WearableCacheItem(){
+                            CacheId = appear.WearableData[i].CacheID,
+                            TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)                           
+                        };
                    
@@ -12004,150 +12012,65 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            if (cachedtex.AgentData.SessionID != SessionId)
                return false;
-            
            // TODO: don't create new blocks if recycling an old packet
            cachedresp.AgentData.AgentID = AgentId;
            cachedresp.AgentData.SessionID = m_sessionId;
-            cachedresp.AgentData.SerialNum = m_cachedTextureSerial;
+            cachedresp.AgentData.SerialNum = cachedtex.AgentData.SerialNum;
-            m_cachedTextureSerial++;
            cachedresp.WearableData =
                new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
-            //IAvatarFactoryModule fac = m_scene.RequestModuleInterface<IAvatarFactoryModule>();
-           // var item = fac.GetBakedTextureFaces(AgentId);
-            //WearableCacheItem[] items = fac.GetCachedItems(AgentId);
-            IAssetService cache = m_scene.AssetService;
-            IBakedTextureModule bakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            //bakedTextureModule = null;
            int maxWearablesLoop = cachedtex.WearableData.Length;
            if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
                maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
-            if (bakedTextureModule != null && cache != null)
+            int cacheHits = 0;
-            {
-                // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
-                WearableCacheItem[] cacheItems = null;
+            // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
-                ScenePresence p = m_scene.GetScenePresence(AgentId);
-                if (p.Appearance != null)
-                    if (p.Appearance.WearableCacheItems == null || p.Appearance.WearableCacheItemsDirty)
-                    {
-                        try
-                        {
-                            cacheItems = bakedTextureModule.Get(AgentId);
-                            p.Appearance.WearableCacheItems = cacheItems;
-                            p.Appearance.WearableCacheItemsDirty = false;
-                        }
-                        /*
+            WearableCacheItem[] cacheItems = null;
-                         * The following Catch types DO NOT WORK, it jumps to the General Packet Exception Handler if you don't catch Exception!
-                         * 
-                        catch (System.Net.Sockets.SocketException)
-                        {
-                            cacheItems = null;
-                        }
-                        catch (WebException)
-                        {
-                            cacheItems = null;
-                        }
-                        catch (InvalidOperationException)
-                        {
-                            cacheItems = null;
-                        } */
-                        catch (Exception)
-                        {
-                            cacheItems = null;
-                        }
-                        
-                    }
-                    else if (p.Appearance.WearableCacheItems != null)
-                    {
-                        cacheItems = p.Appearance.WearableCacheItems;
-                    }
-                if (cache != null && cacheItems != null)
+            ScenePresence p = m_scene.GetScenePresence(AgentId);
-                {
-                    foreach (WearableCacheItem item in cacheItems)
-                    {
-                       
-                        if (cache.GetCached(item.TextureID.ToString()) == null)
-                        {
-                            item.TextureAsset.Temporary = true;
-                            cache.Store(item.TextureAsset);
-                        }
+            if (p != null && p.Appearance != null)
+            {
+                cacheItems = p.Appearance.WearableCacheItems;
+            }
-                    }
+            if (cacheItems != null)
-                }
+            {
-               
+                for (int i = 0; i < maxWearablesLoop; i++)
-                if (cacheItems != null)
                {
-                   
+                    int idx = cachedtex.WearableData[i].TextureIndex;
-                    for (int i = 0; i < maxWearablesLoop; i++)
-                    {
-                        WearableCacheItem item =
-                            WearableCacheItem.SearchTextureIndex(cachedtex.WearableData[i].TextureIndex,cacheItems);
-                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                    cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                        cachedresp.WearableData[i].TextureIndex= cachedtex.WearableData[i].TextureIndex;
+                    cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-                        cachedresp.WearableData[i].HostName = new byte[0];
+                    cachedresp.WearableData[i].HostName = new byte[0];
-                        if (item != null && cachedtex.WearableData[i].ID == item.CacheId)
+                    if (cachedtex.WearableData[i].ID == cacheItems[idx].CacheId)
-                        {
+                    {
-                            
+                        cachedresp.WearableData[i].TextureID = cacheItems[idx].TextureID;
-                            cachedresp.WearableData[i].TextureID = item.TextureID;
+                        cacheHits++;
-                        }
-                        else
-                        {
-                            cachedresp.WearableData[i].TextureID = UUID.Zero;
-                        }
                    }
-                }
+                    else
-                else
-                {
-                    for (int i = 0; i < maxWearablesLoop; i++)
                    {
-                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
                        cachedresp.WearableData[i].TextureID = UUID.Zero;
-                        //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        cachedresp.WearableData[i].HostName = new byte[0];
                    }
                }
            }
            else
            {
-                if (cache == null)
+                for (int i = 0; i < maxWearablesLoop; i++)
                {
-                    for (int i = 0; i < maxWearablesLoop; i++)
+                    cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                    {
+                    cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
-                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                    cachedresp.WearableData[i].TextureID = UUID.Zero;
-                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+                    //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        cachedresp.WearableData[i].TextureID = UUID.Zero;
+                    cachedresp.WearableData[i].HostName = new byte[0];
-                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        cachedresp.WearableData[i].HostName = new byte[0];
-                    }
                }
-                else
+            }
-                {
-                    for (int i = 0; i < maxWearablesLoop; i++)
-                    {
-                        cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
-                        cachedresp.WearableData[i].TextureIndex = cachedtex.WearableData[i].TextureIndex;
+            m_log.DebugFormat("texture cached: hits {0}", cacheHits);
-                        if (cache.GetCached(cachedresp.WearableData[i].TextureID.ToString()) == null)
-                            cachedresp.WearableData[i].TextureID = UUID.Zero;
-                            //UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        else
-                            cachedresp.WearableData[i].TextureID = UUID.Zero;
-                                // UUID.Parse("8334fb6e-c2f5-46ee-807d-a435f61a8d46");
-                        cachedresp.WearableData[i].HostName = new byte[0];
-                    }
-                }
-            }
            cachedresp.Header.Zerocoded = true;
            OutPacket(cachedresp, ThrottleOutPacketType.Task);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index b7c8594..a3fdae1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -1750,25 +1750,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            endPoint,
                            sessionInfo);
            
-                    // Send ack straight away to let the viewer know that the connection is active.
-                    // The client will be null if it already exists (e.g. if on a region crossing the client sends a use
-                    // circuit code to the existing child agent.  This is not particularly obvious.
-                    SendAckImmediate(endPoint, uccp.Header.Sequence);
-            
-                    // We only want to send initial data to new clients, not ones which are being converted from child to root.
-                    if (client != null)
-                    {
-                        AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
-                        bool tp = (aCircuit.teleportFlags > 0);
-                        // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
-                        if (!tp)
-                            client.SceneAgent.SendInitialDataToMe();
-                    }
                    // Now we know we can handle more data
-                    Thread.Sleep(200);
+//                    Thread.Sleep(200);
-                    // Obtain the queue and remove it from the cache
+                    // Obtain the pending queue and remove it from the cache
                    Queue<UDPPacketBuffer> queue = null;
                    lock (m_pendingCache)
@@ -1790,6 +1775,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        PacketReceived(buf);
                    }
                    queue = null;
+                    // Send ack straight away to let the viewer know that the connection is active.
+                    // The client will be null if it already exists (e.g. if on a region crossing the client sends a use
+                    // circuit code to the existing child agent.  This is not particularly obvious.
+                    SendAckImmediate(endPoint, uccp.Header.Sequence);
+                    // We only want to send initial data to new clients, not ones which are being converted from child to root.
+                    if (client != null)
+                    {
+                        AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
+                        bool tp = (aCircuit.teleportFlags > 0);
+                        // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
+                        if (!tp)
+                            client.SceneAgent.SendInitialDataToMe();
+                    }
                }
                else
                {
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 09cc998..2e5c58a 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -188,27 +188,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                // Process the visual params, this may change height as well
                if (visualParams != null)
                {
-                    //                    string[] visualParamsStrings = new string[visualParams.Length];
-                    //                    for (int i = 0; i < visualParams.Length; i++)
-                    //                        visualParamsStrings[i] = visualParams[i].ToString();
-                    //                    m_log.DebugFormat(
-                    //                        "[AVFACTORY]: Setting visual params for {0} to {1}",
-                    //                        client.Name, string.Join(", ", visualParamsStrings));
-/*
-                    float oldHeight = sp.Appearance.AvatarHeight;
-                    changed = sp.Appearance.SetVisualParams(visualParams);
-                    if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0)
-                        ((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight);
- */
-//                    float oldoff = sp.Appearance.AvatarFeetOffset;
-//                    Vector3 oldbox = sp.Appearance.AvatarBoxSize;
                    changed = sp.Appearance.SetVisualParams(visualParams);
-//                    float off = sp.Appearance.AvatarFeetOffset;
-//                    Vector3 box = sp.Appearance.AvatarBoxSize;
-//                    if(oldoff != off || oldbox != box)
-//                        ((ScenePresence)sp).SetSize(box,off);
                }
            
                // Process the baked texture array
@@ -222,9 +202,15 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 //                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
                    // If bake textures are missing and this is not an NPC, request a rebake from client
-                    if (!ValidateBakedTextureCache(sp) && (((ScenePresence)sp).PresenceType != PresenceType.Npc))
+                    // rebake may messup caching, and should not be needed
-                        RequestRebake(sp, true);
+//                    if (!UpdateBakedTextureCache(sp,cacheItems) && (((ScenePresence)sp).PresenceType != PresenceType.Npc))
+//                        RequestRebake(sp, true);
+                    UpdateBakedTextureCache(sp, cacheItems);
                    // This appears to be set only in the final stage of the appearance
                    // update transaction. In theory, we should be able to do an immediate
@@ -377,121 +363,243 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
            }
        }
+        // called on textures update
+        public bool UpdateBakedTextureCache(IScenePresence sp, WearableCacheItem[] cacheItems)
+        {
+            bool defonly = true; // are we only using default textures
+            // uploaded baked textures will be in assets local cache
+            IAssetService cache = m_scene.AssetService;
+            int validDirtyBakes = 0;
+            int hits = 0;
+            // our main cacheIDs mapper is p.Appearance.WearableCacheItems
+            WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems;
+            if (wearableCache == null)
+            {
+                wearableCache = WearableCacheItem.GetDefaultCacheItem();
+            }
+            // Process received baked textures
+            for (int i = 0; i < cacheItems.Length; i++)
+            {
+                int idx = (int)cacheItems[i].TextureIndex;
+                Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+                // No face
+                if (face == null)
+                {
+                    // for some reason viewer is cleaning this
+                    sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
+                    sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                    wearableCache[idx].CacheId = UUID.Zero;
+                    wearableCache[idx].TextureID = UUID.Zero;
+                    wearableCache[idx].TextureAsset = null;
+                    continue;
+                }
+                else
+                {
+                    if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                    {
+                        wearableCache[idx].CacheId = UUID.Zero;
+                        wearableCache[idx].TextureID = UUID.Zero;
+                        wearableCache[idx].TextureAsset = null;
+                        continue;
+                    }
+                    defonly = false; // found a non-default texture reference
+                    if(sp.Appearance.Texture.FaceTextures[idx].TextureID == wearableCache[idx].TextureID)
+                    {
+                        if(wearableCache[idx].CacheId != cacheItems[i].CacheId)
+                        {
+                            wearableCache[idx].CacheId = cacheItems[i].CacheId;
+                            validDirtyBakes++;
+                            hits++;
+                            //assuming this can only happen if asset is in cache
+                        }
+                        continue;
+                    }
+                   
+                    wearableCache[idx].TextureAsset = null;
+                    if (cache != null)
+                       wearableCache[idx].TextureAsset = cache.GetCached(face.TextureID.ToString());
+                    if (wearableCache[idx].TextureAsset != null)
+                    {
+                        wearableCache[idx].CacheId = cacheItems[i].CacheId;
+                        wearableCache[idx].TextureID = sp.Appearance.Texture.FaceTextures[idx].TextureID;
+                        validDirtyBakes++;
+                        hits++;
+                    }
+                    else
+                    {
+                        wearableCache[idx].CacheId = UUID.Zero;
+                        wearableCache[idx].TextureID = UUID.Zero;
+                        wearableCache[idx].TextureAsset = null;
+                        continue;
+                    }
+                }
+            }
+            sp.Appearance.WearableCacheItems = wearableCache;
+            // if we got a full set of baked textures save all in BakedTextureModule
+            if (validDirtyBakes == cacheItems.Length)
+            {
+                IBakedTextureModule m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+                if (m_BakedTextureModule != null)
+                {
+                    m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache");
+                    WearableCacheItem[] toBakedModule = new WearableCacheItem[AvatarAppearance.BAKE_INDICES.Length];
+                    for (int i = 0; i < cacheItems.Length; i++)
+                    {
+                        int idx = (int)cacheItems[i].TextureIndex;
+                        cacheItems[i].CacheId = wearableCache[idx].CacheId;
+                        cacheItems[i].TextureID = wearableCache[idx].TextureID;
+                        cacheItems[i].TextureAsset = wearableCache[idx].TextureAsset;
+                    }
+                    m_BakedTextureModule.Store(sp.UUID, cacheItems);
+                }
+            }
+            // debug
+            for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+            {
+                int j = AvatarAppearance.BAKE_INDICES[iter];
+                m_log.Debug("[UpdateBCache] {" + iter + "/" + 
+                                    sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
+                                    sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
+                                    sp.Appearance.WearableCacheItems[j].TextureID);
+            }
+            // If we only found default textures, then the appearance is not cached
+            return (defonly ? false : true);
+        }
+        // called when we get a new root avatar
        public bool ValidateBakedTextureCache(IScenePresence sp)
        {
            bool defonly = true; // are we only using default textures
-            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
+            IAssetService cache = m_scene.AssetService;
            IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
            WearableCacheItem[] wearableCache = null;
+            WearableCacheItem[] bakedModuleCache = null;
+            wearableCache = WearableCacheItem.GetDefaultCacheItem();
+             int hits = 0;
            // Cache wearable data for teleport.
            // Only makes sense if there's a bake module and a cache module
            if (bakedModule != null && cache != null)
            {
+                m_log.Debug("[ValidateBakedCache] calling bakedModule");
                try
                {
-                    wearableCache = bakedModule.Get(sp.UUID);
+                    bakedModuleCache = bakedModule.Get(sp.UUID);
                }
                catch (Exception)
                {
+                    bakedModuleCache = null;
-                }
-                if (wearableCache != null)
-                {
-                    for (int i = 0; i < wearableCache.Length; i++)
-                    {
-                       cache.Cache(wearableCache[i].TextureAsset);
-                    }
                }
-            }
-            /*
+                if (bakedModuleCache != null)
-             IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            if (invService.GetRootFolder(userID) != null)
-            {
-                WearableCacheItem[] wearableCache = null;
-                if (bakedModule != null)
                {
-                    try
+                    m_log.Debug("[ValidateBakedCache] got bakedModule cache " + bakedModuleCache.Length);
+                    for (int i = 0; i < bakedModuleCache.Length; i++)
                    {
-                        wearableCache = bakedModule.Get(userID);
+                        int j = (int)bakedModuleCache[i].TextureIndex;
-                        appearance.WearableCacheItems = wearableCache;
-                        appearance.WearableCacheItemsDirty = false;
+                        if (bakedModuleCache[i].TextureAsset != null)
-                        foreach (WearableCacheItem item in wearableCache)
                        {
-                            appearance.Texture.FaceTextures[item.TextureIndex].TextureID = item.TextureID;
+                            wearableCache[j].TextureID = bakedModuleCache[i].TextureID;
+                            wearableCache[j].CacheId = bakedModuleCache[i].CacheId;
+                            wearableCache[j].TextureAsset = bakedModuleCache[i].TextureAsset;
+                            bakedModuleCache[i].TextureAsset.Temporary = true;
+                            bakedModuleCache[i].TextureAsset.Local = true;
+                            cache.Store(bakedModuleCache[i].TextureAsset);
                        }
                    }
-                    catch (Exception)
-                    {
-                        
-                    }
                }
-             */
+            }
-            // Process the texture entry
+            // Process the baked textures
            for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
            {
                int idx = AvatarAppearance.BAKE_INDICES[i];
                Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
-                // No face, so lets check our baked service cache, teleport or login.
+                // No face, so lets check our cache
-                if (face == null)
+                if (face == null || face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                {
-                    if (wearableCache != null)
+                    sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint)idx);
+                    if (wearableCache[idx].TextureID != UUID.Zero)
                    {
-                        // If we find the an appearance item, set it as the textureentry and the face
+                        sp.Appearance.Texture.FaceTextures[idx].TextureID = wearableCache[idx].TextureID;
-                        WearableCacheItem searchitem = WearableCacheItem.SearchTextureIndex((uint) idx, wearableCache);
+                        face = sp.Appearance.Texture.FaceTextures[idx];
-                        if (searchitem != null)
+                        // let run to end of loop to check cache
-                        {
-                            sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
-                            sp.Appearance.Texture.FaceTextures[idx].TextureID = searchitem.TextureID;
-                            face = sp.Appearance.Texture.FaceTextures[idx];
-                        }
-                        else
-                        {
-                            // if there is no texture entry and no baked cache, skip it
-                            continue;
-                        }
                    }
                    else
                    {
-                        //No texture entry face and no cache.  Skip this face.
+                        sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                        face = sp.Appearance.Texture.FaceTextures[idx];
+// lets try not invalidating the cache entry 
+//                        wearableCache[idx].CacheId = UUID.Zero;
+//                        wearableCache[idx].TextureAsset = null;
                        continue;
                    }
                }
-                    
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-//                    face.TextureID, idx, client.Name, client.AgentId);
-                // if the texture is one of the "defaults" then skip it
-                // this should probably be more intelligent (skirt texture doesnt matter
-                // if the avatar isnt wearing a skirt) but if any of the main baked 
-                // textures is default then the rest should be as well
                if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                {
+                    defonly = false; // found a non-default texture reference
                    continue;
-                
+                }
-                defonly = false; // found a non-default texture reference
-                if (cache != null)
+                if(wearableCache[idx].TextureID != face.TextureID)
                {
-                    if (!cache.Check(face.TextureID.ToString()))
+                    wearableCache[idx].CacheId = UUID.Zero;
-                        return false;
+                    wearableCache[idx].TextureID = UUID.Zero;
+                    wearableCache[idx].TextureAsset = null;
+                    continue;
                }
-                else
+                wearableCache[idx].TextureAsset = null;
+                if (cache != null)
                {
-                    if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
+                    wearableCache[idx].TextureAsset = m_scene.AssetService.Get(face.TextureID.ToString());
-                        return false;
+                    if (wearableCache[idx].TextureAsset == null)
+                    {
+                        wearableCache[idx].CacheId = UUID.Zero;
+                        wearableCache[idx].TextureID = UUID.Zero;
+                    }
+                    else
+                        hits++;
                }
            }
-//            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
+            sp.Appearance.WearableCacheItems = wearableCache;
+            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1} {2} {3}", sp.Name, sp.UUID, hits, defonly.ToString());
+            // debug
+            for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+            {
+                int j = AvatarAppearance.BAKE_INDICES[iter];
+                m_log.Debug("[ValidateBakedCache] {" + iter + "/" +
+                                    sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
+                                    sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
+                                    sp.Appearance.WearableCacheItems[j].TextureID);
+            }
            // If we only found default textures, then the appearance is not cached
            return (defonly ? false : true);
        }
        public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
        {
            int texturesRebaked = 0;
@@ -506,14 +614,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                if (face == null)
                    continue;
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-//                    face.TextureID, idx, client.Name, client.AgentId);
-                // if the texture is one of the "defaults" then skip it
-                // this should probably be more intelligent (skirt texture doesnt matter
-                // if the avatar isnt wearing a skirt) but if any of the main baked
-                // textures is default then the rest should be as well
                if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                    continue;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e4f23f9..7b13e0b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -1032,15 +1032,18 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                // object itself before we rez.
                //
                // Only do these for the first object if we are rezzing a coalescence.
-                if (i == 0)
+                // nahh dont mess with coalescence objects,
+                // the name in inventory can be change for inventory purpuses only
+                if (objlist.Count == 1)
                {
                    rootPart.Name = item.Name;
                    rootPart.Description = item.Description;
-                    if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
+                }
-                    {
-                        rootPart.ObjectSaleType = item.SaleType;
+                if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
-                        rootPart.SalePrice = item.SalePrice;
+                {
-                    }
+                    rootPart.ObjectSaleType = item.SaleType;
+                    rootPart.SalePrice = item.SalePrice;
                }
                so.FromFolderID = item.Folder;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 746b703..8634a3a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1234,8 +1234,9 @@ namespace OpenSim.Region.Framework.Scenes
                {
                    uint perms = taskItem.CurrentPermissions;
                    PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms);
-                    agentItem.BasePermissions = perms | (uint)PermissionMask.Move;
+//                    agentItem.BasePermissions = perms | (uint)PermissionMask.Move;
-                    agentItem.CurrentPermissions = agentItem.BasePermissions;
+//                    agentItem.CurrentPermissions = agentItem.BasePermissions;
+                    agentItem.CurrentPermissions = perms | (uint)PermissionMask.Move;
                }
                else
                {
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 08e26c5..dd0c828 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -1,581 +1,581 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using System.Threading;
+using System.Threading;
-using OpenMetaverse;
+using OpenMetaverse;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Console;
+using OpenSim.Framework.Console;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
-namespace OpenSim.Region.Framework.Scenes
+namespace OpenSim.Region.Framework.Scenes
-{
+{
-    public abstract class SceneBase : IScene
+    public abstract class SceneBase : IScene
-    {
+    {
        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        protected static readonly string LogHeader = "[SCENE]";
+        protected static readonly string LogHeader = "[SCENE]";
-        #region Events
+        #region Events
-        public event restart OnRestart;
+        public event restart OnRestart;
-        #endregion
+        #endregion
-        #region Fields
+        #region Fields
-        public string Name { get { return RegionInfo.RegionName; } }
+        public string Name { get { return RegionInfo.RegionName; } }
-        
+        
-        public IConfigSource Config
+        public IConfigSource Config
-        {
+        {
-            get { return GetConfig(); }
+            get { return GetConfig(); }
-        }
+        }
-        protected virtual IConfigSource GetConfig()
+        protected virtual IConfigSource GetConfig()
-        {
+        {
-            return null;
+            return null;
-        }
+        }
-        /// <value>
+        /// <value>
-        /// All the region modules attached to this scene.
+        /// All the region modules attached to this scene.
-        /// </value>
+        /// </value>
-        public Dictionary<string, IRegionModuleBase> RegionModules
+        public Dictionary<string, IRegionModuleBase> RegionModules
-        {
+        {
-            get { return m_regionModules; }
+            get { return m_regionModules; }
-        }
+        }
-        private Dictionary<string, IRegionModuleBase> m_regionModules = new Dictionary<string, IRegionModuleBase>();
+        private Dictionary<string, IRegionModuleBase> m_regionModules = new Dictionary<string, IRegionModuleBase>();
-        /// <value>
+        /// <value>
-        /// The module interfaces available from this scene.
+        /// The module interfaces available from this scene.
-        /// </value>
+        /// </value>
-        protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>();
+        protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>();
-        protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
+        protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
-        /// <value>
+        /// <value>
-        /// The module commanders available from this scene
+        /// The module commanders available from this scene
-        /// </value>
+        /// </value>
-        protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
+        protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
-        
+        
-        /// <value>
+        /// <value>
-        /// Registered classes that are capable of creating entities.
+        /// Registered classes that are capable of creating entities.
-        /// </value>
+        /// </value>
-        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
+        protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
-        /// <summary>
+        /// <summary>
-        /// The last allocated local prim id.  When a new local id is requested, the next number in the sequence is
+        /// The last allocated local prim id.  When a new local id is requested, the next number in the sequence is
-        /// dispensed.
+        /// dispensed.
-        /// </summary>
+        /// </summary>
-        protected uint m_lastAllocatedLocalId = 720000;
+        protected uint m_lastAllocatedLocalId = 720000;
-        private readonly Mutex _primAllocateMutex = new Mutex(false);
+        private readonly Mutex _primAllocateMutex = new Mutex(false);
-        
+        
-        protected readonly ClientManager m_clientManager = new ClientManager();
+        protected readonly ClientManager m_clientManager = new ClientManager();
-        public bool LoginsEnabled
+        public bool LoginsEnabled
-        {
+        {
-            get
+            get
-            {
+            {
-                return m_loginsEnabled;
+                return m_loginsEnabled;
-            }
+            }
-            set
+            set
-            {
+            {
-                if (m_loginsEnabled != value)
+                if (m_loginsEnabled != value)
-                {
+                {
-                    m_loginsEnabled = value;
+                    m_loginsEnabled = value;
-                    EventManager.TriggerRegionLoginsStatusChange(this);
+                    EventManager.TriggerRegionLoginsStatusChange(this);
-                }
+                }
-            }
+            }
-        }
+        }
-        private bool m_loginsEnabled;
+        private bool m_loginsEnabled;
-        public bool Ready
+        public bool Ready
-        {
+        {
-            get
+            get
-            {
+            {
-                return m_ready;
+                return m_ready;
-            }
+            }
-            set
+            set
-            {
+            {
-                if (m_ready != value)
+                if (m_ready != value)
-                {
+                {
-                    m_ready = value;
+                    m_ready = value;
-                    EventManager.TriggerRegionReadyStatusChange(this);
+                    EventManager.TriggerRegionReadyStatusChange(this);
-                }
+                }
-            }
+            }
-        }
+        }
-        private bool m_ready;
+        private bool m_ready;
-        public float TimeDilation
+        public float TimeDilation
-        {
+        {
-            get { return 1.0f; }
+            get { return 1.0f; }
-        }
+        }
-        protected ulong m_regionHandle;
+        protected ulong m_regionHandle;
-        protected string m_regionName;
+        protected string m_regionName;
-        public ITerrainChannel Heightmap;
+        public ITerrainChannel Heightmap;
-        /// <value>
+        /// <value>
-        /// Allows retrieval of land information for this scene.
+        /// Allows retrieval of land information for this scene.
-        /// </value>
+        /// </value>
-        public ILandChannel LandChannel;
+        public ILandChannel LandChannel;
-        /// <value>
+        /// <value>
-        /// Manage events that occur in this scene (avatar movement, script rez, etc.).  Commonly used by region modules
+        /// Manage events that occur in this scene (avatar movement, script rez, etc.).  Commonly used by region modules
-        /// to subscribe to scene events.
+        /// to subscribe to scene events.
-        /// </value>
+        /// </value>
-        public EventManager EventManager
+        public EventManager EventManager
-        {
+        {
-            get { return m_eventManager; }
+            get { return m_eventManager; }
-        }
+        }
-        protected EventManager m_eventManager;
+        protected EventManager m_eventManager;
-        protected ScenePermissions m_permissions;
+        protected ScenePermissions m_permissions;
-        public ScenePermissions Permissions
+        public ScenePermissions Permissions
-        {
+        {
-            get { return m_permissions; }
+            get { return m_permissions; }
-        }
+        }
-        protected string m_datastore;
+        protected string m_datastore;
-         /* Used by the loadbalancer plugin on GForge */
+         /* Used by the loadbalancer plugin on GForge */
-        protected RegionStatus m_regStatus;
+        protected RegionStatus m_regStatus;
-        public RegionStatus RegionStatus
+        public RegionStatus RegionStatus
-        {
+        {
-            get { return m_regStatus; }
+            get { return m_regStatus; }
-            set { m_regStatus = value; }
+            set { m_regStatus = value; }
-        }
+        }
-        #endregion
+        #endregion
-        public SceneBase(RegionInfo regInfo)
+        public SceneBase(RegionInfo regInfo)
-        {
+        {
-            RegionInfo = regInfo;
+            RegionInfo = regInfo;
-        }
+        }
-        #region Update Methods
+        #region Update Methods
-        /// <summary>
+        /// <summary>
-        /// Called to update the scene loop by a number of frames and until shutdown.
+        /// Called to update the scene loop by a number of frames and until shutdown.
-        /// </summary>
+        /// </summary>
-        /// <param name="frames">
+        /// <param name="frames">
-        /// Number of frames to update.  Exits on shutdown even if there are frames remaining.
+        /// Number of frames to update.  Exits on shutdown even if there are frames remaining.
-        /// If -1 then updates until shutdown.
+        /// If -1 then updates until shutdown.
-        /// </param>
+        /// </param>
-        public abstract void Update(int frames);
+        public abstract void Update(int frames);
-        #endregion
+        #endregion
-        #region Terrain Methods
+        #region Terrain Methods
-        /// <summary>
+        /// <summary>
-        /// Loads the World heightmap
+        /// Loads the World heightmap
-        /// </summary>
+        /// </summary>
-        public abstract void LoadWorldMap();
+        public abstract void LoadWorldMap();
-        /// <summary>
+        /// <summary>
-        /// Send the region heightmap to the client
+        /// Send the region heightmap to the client
-        /// </summary>
+        /// </summary>
-        /// <param name="RemoteClient">Client to send to</param>
+        /// <param name="RemoteClient">Client to send to</param>
-        public virtual void SendLayerData(IClientAPI RemoteClient)
+        public virtual void SendLayerData(IClientAPI RemoteClient)
-        {
+        {
-            RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
+            RemoteClient.SendLayerData(Heightmap.GetFloatsSerialised());
-        }
+        }
-        #endregion
+        #endregion
-        #region Add/Remove Agent/Avatar
+        #region Add/Remove Agent/Avatar
-        public abstract ISceneAgent AddNewAgent(IClientAPI client, PresenceType type);
+        public abstract ISceneAgent AddNewAgent(IClientAPI client, PresenceType type);
-        public abstract bool CloseAgent(UUID agentID, bool force);
+        public abstract bool CloseAgent(UUID agentID, bool force);
-        public bool TryGetScenePresence(UUID agentID, out object scenePresence)
+        public bool TryGetScenePresence(UUID agentID, out object scenePresence)
-        {
+        {
-            scenePresence = null;
+            scenePresence = null;
-            ScenePresence sp = null;
+            ScenePresence sp = null;
-            if (TryGetScenePresence(agentID, out sp))
+            if (TryGetScenePresence(agentID, out sp))
-            {
+            {
-                scenePresence = sp;
+                scenePresence = sp;
-                return true;
+                return true;
-            }
+            }
-            return false;
+            return false;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Try to get a scene presence from the scene
+        /// Try to get a scene presence from the scene
-        /// </summary>
+        /// </summary>
-        /// <param name="agentID"></param>
+        /// <param name="agentID"></param>
-        /// <param name="scenePresence">null if there is no scene presence with the given agent id</param>
+        /// <param name="scenePresence">null if there is no scene presence with the given agent id</param>
-        /// <returns>true if there was a scene presence with the given id, false otherwise.</returns>
+        /// <returns>true if there was a scene presence with the given id, false otherwise.</returns>
-        public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
+        public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
-        #endregion
+        #endregion
-        /// <summary>
+        /// <summary>
-        ///
+        ///
-        /// </summary>
+        /// </summary>
-        /// <returns></returns>
+        /// <returns></returns>
-        public virtual RegionInfo RegionInfo { get; private set; }
+        public virtual RegionInfo RegionInfo { get; private set; }
-        #region admin stuff
+        #region admin stuff
-        
+        
-        public abstract void OtherRegionUp(GridRegion otherRegion);
+        public abstract void OtherRegionUp(GridRegion otherRegion);
-        public virtual string GetSimulatorVersion()
+        public virtual string GetSimulatorVersion()
-        {
+        {
-            return "OpenSimulator Server";
+            return "OpenSimulator Server";
-        }
+        }
-        #endregion
+        #endregion
-        #region Shutdown
+        #region Shutdown
-        /// <summary>
+        /// <summary>
-        /// Tidy before shutdown
+        /// Tidy before shutdown
-        /// </summary>
+        /// </summary>
-        public virtual void Close()
+        public virtual void Close()
-        {
+        {
-            try
+            try
-            {
+            {
-                EventManager.TriggerShutdown();
+                EventManager.TriggerShutdown();
-            }
+            }
-            catch (Exception e)
+            catch (Exception e)
-            {
+            {
-                m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e));
+                m_log.Error(string.Format("[SCENE]: SceneBase.cs: Close() - Failed with exception ", e));
-            }
+            }
-        }
+        }
-        #endregion
+        #endregion
-        /// <summary>
+        /// <summary>
-        /// Returns a new unallocated local ID
+        /// Returns a new unallocated local ID
-        /// </summary>
+        /// </summary>
-        /// <returns>A brand new local ID</returns>
+        /// <returns>A brand new local ID</returns>
-        public uint AllocateLocalId()
+        public uint AllocateLocalId()
-        {
+        {
-            uint myID;
+            uint myID;
-            _primAllocateMutex.WaitOne();
+            _primAllocateMutex.WaitOne();
-            myID = ++m_lastAllocatedLocalId;
+            myID = ++m_lastAllocatedLocalId;
-            _primAllocateMutex.ReleaseMutex();
+            _primAllocateMutex.ReleaseMutex();
-            return myID;
+            return myID;
-        }
+        }
-        
+        
-        #region Module Methods
+        #region Module Methods
-        /// <summary>
+        /// <summary>
-        /// Add a region-module to this scene. TODO: This will replace AddModule in the future.
+        /// Add a region-module to this scene. TODO: This will replace AddModule in the future.
-        /// </summary>
+        /// </summary>
-        /// <param name="name"></param>
+        /// <param name="name"></param>
-        /// <param name="module"></param>
+        /// <param name="module"></param>
-        public void AddRegionModule(string name, IRegionModuleBase module)
+        public void AddRegionModule(string name, IRegionModuleBase module)
-        {
+        {
-            if (!RegionModules.ContainsKey(name))
+            if (!RegionModules.ContainsKey(name))
-            {
+            {
-                RegionModules.Add(name, module);
+                RegionModules.Add(name, module);
-            }
+            }
-        }
+        }
-        public void RemoveRegionModule(string name)
+        public void RemoveRegionModule(string name)
-        {
+        {
-            RegionModules.Remove(name);
+            RegionModules.Remove(name);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Register a module commander.
+        /// Register a module commander.
-        /// </summary>
+        /// </summary>
-        /// <param name="commander"></param>
+        /// <param name="commander"></param>
-        public void RegisterModuleCommander(ICommander commander)
+        public void RegisterModuleCommander(ICommander commander)
-        {
+        {
-            lock (m_moduleCommanders)
+            lock (m_moduleCommanders)
-            {
+            {
-                m_moduleCommanders.Add(commander.Name, commander);
+                m_moduleCommanders.Add(commander.Name, commander);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Unregister a module commander and all its commands
+        /// Unregister a module commander and all its commands
-        /// </summary>
+        /// </summary>
-        /// <param name="name"></param>
+        /// <param name="name"></param>
-        public void UnregisterModuleCommander(string name)
+        public void UnregisterModuleCommander(string name)
-        {
+        {
-            lock (m_moduleCommanders)
+            lock (m_moduleCommanders)
-            {
+            {
-                ICommander commander;
+                ICommander commander;
-                if (m_moduleCommanders.TryGetValue(name, out commander))
+                if (m_moduleCommanders.TryGetValue(name, out commander))
-                    m_moduleCommanders.Remove(name);
+                    m_moduleCommanders.Remove(name);
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Get a module commander
+        /// Get a module commander
-        /// </summary>
+        /// </summary>
-        /// <param name="name"></param>
+        /// <param name="name"></param>
-        /// <returns>The module commander, null if no module commander with that name was found</returns>
+        /// <returns>The module commander, null if no module commander with that name was found</returns>
-        public ICommander GetCommander(string name)
+        public ICommander GetCommander(string name)
-        {
+        {
-            lock (m_moduleCommanders)
+            lock (m_moduleCommanders)
-            {
+            {
-                if (m_moduleCommanders.ContainsKey(name))
+                if (m_moduleCommanders.ContainsKey(name))
-                    return m_moduleCommanders[name];
+                    return m_moduleCommanders[name];
-            }
+            }
-            
+            
-            return null;
+            return null;
-        }
+        }
-        public Dictionary<string, ICommander> GetCommanders()
+        public Dictionary<string, ICommander> GetCommanders()
-        {
+        {
-            return m_moduleCommanders;
+            return m_moduleCommanders;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Register an interface to a region module.  This allows module methods to be called directly as
+        /// Register an interface to a region module.  This allows module methods to be called directly as
-        /// well as via events.  If there is already a module registered for this interface, it is not replaced
+        /// well as via events.  If there is already a module registered for this interface, it is not replaced
-        /// (is this the best behaviour?)
+        /// (is this the best behaviour?)
-        /// </summary>
+        /// </summary>
-        /// <param name="mod"></param>
+        /// <param name="mod"></param>
-        public void RegisterModuleInterface<M>(M mod)
+        public void RegisterModuleInterface<M>(M mod)
-        {
+        {
-//            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
+//            m_log.DebugFormat("[SCENE BASE]: Registering interface {0}", typeof(M));
-            
+            
-            List<Object> l = null;
+            List<Object> l = null;
-            if (!ModuleInterfaces.TryGetValue(typeof(M), out l))
+            if (!ModuleInterfaces.TryGetValue(typeof(M), out l))
-            {
+            {
-                l = new List<Object>();
+                l = new List<Object>();
-                ModuleInterfaces.Add(typeof(M), l);
+                ModuleInterfaces.Add(typeof(M), l);
-            }
+            }
-            if (l.Count > 0)
+            if (l.Count > 0)
-                return;
+                return;
-            l.Add(mod);
+            l.Add(mod);
-            if (mod is IEntityCreator)
+            if (mod is IEntityCreator)
-            {
+            {
-                IEntityCreator entityCreator = (IEntityCreator)mod;
+                IEntityCreator entityCreator = (IEntityCreator)mod;
-                foreach (PCode pcode in entityCreator.CreationCapabilities)
+                foreach (PCode pcode in entityCreator.CreationCapabilities)
-                {
+                {
-                    m_entityCreators[pcode] = entityCreator;
+                    m_entityCreators[pcode] = entityCreator;
-                }
+                }
-            }
+            }
-        }
+        }
-        public void UnregisterModuleInterface<M>(M mod)
+        public void UnregisterModuleInterface<M>(M mod)
-        {
+        {
-            List<Object> l;
+            List<Object> l;
-            if (ModuleInterfaces.TryGetValue(typeof(M), out l))
+            if (ModuleInterfaces.TryGetValue(typeof(M), out l))
-            {
+            {
-                if (l.Remove(mod))
+                if (l.Remove(mod))
-                {
+                {
-                    if (mod is IEntityCreator)
+                    if (mod is IEntityCreator)
-                    {
+                    {
-                        IEntityCreator entityCreator = (IEntityCreator)mod;
+                        IEntityCreator entityCreator = (IEntityCreator)mod;
-                        foreach (PCode pcode in entityCreator.CreationCapabilities)
+                        foreach (PCode pcode in entityCreator.CreationCapabilities)
-                        {
+                        {
-                            m_entityCreators[pcode] = null;
+                            m_entityCreators[pcode] = null;
-                        }
+                        }
-                    }
+                    }
-                }
+                }
-            }
+            }
-        }
+        }
-        public void StackModuleInterface<M>(M mod)
+        public void StackModuleInterface<M>(M mod)
-        {
+        {
-            List<Object> l;
+            List<Object> l;
-            if (ModuleInterfaces.ContainsKey(typeof(M)))
+            if (ModuleInterfaces.ContainsKey(typeof(M)))
-                l = ModuleInterfaces[typeof(M)];
+                l = ModuleInterfaces[typeof(M)];
-            else
+            else
-                l = new List<Object>();
+                l = new List<Object>();
-            if (l.Contains(mod))
+            if (l.Contains(mod))
-                return;
+                return;
-            l.Add(mod);
+            l.Add(mod);
-            if (mod is IEntityCreator)
+            if (mod is IEntityCreator)
-            {
+            {
-                IEntityCreator entityCreator = (IEntityCreator)mod;
+                IEntityCreator entityCreator = (IEntityCreator)mod;
-                foreach (PCode pcode in entityCreator.CreationCapabilities)
+                foreach (PCode pcode in entityCreator.CreationCapabilities)
-                {
+                {
-                    m_entityCreators[pcode] = entityCreator;
+                    m_entityCreators[pcode] = entityCreator;
-                }
+                }
-            }
+            }
-            ModuleInterfaces[typeof(M)] = l;
+            ModuleInterfaces[typeof(M)] = l;
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// For the given interface, retrieve the region module which implements it.
+        /// For the given interface, retrieve the region module which implements it.
-        /// </summary>
+        /// </summary>
-        /// <returns>null if there is no registered module implementing that interface</returns>
+        /// <returns>null if there is no registered module implementing that interface</returns>
-        public T RequestModuleInterface<T>()
+        public T RequestModuleInterface<T>()
-        {
+        {
-            if (ModuleInterfaces.ContainsKey(typeof(T)) &&
+            if (ModuleInterfaces.ContainsKey(typeof(T)) &&
-                    (ModuleInterfaces[typeof(T)].Count > 0))
+                    (ModuleInterfaces[typeof(T)].Count > 0))
-                return (T)ModuleInterfaces[typeof(T)][0];
+                return (T)ModuleInterfaces[typeof(T)][0];
-            else
+            else
-                return default(T);
+                return default(T);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// For the given interface, retrieve an array of region modules that implement it.
+        /// For the given interface, retrieve an array of region modules that implement it.
-        /// </summary>
+        /// </summary>
-        /// <returns>an empty array if there are no registered modules implementing that interface</returns>
+        /// <returns>an empty array if there are no registered modules implementing that interface</returns>
-        public T[] RequestModuleInterfaces<T>()
+        public T[] RequestModuleInterfaces<T>()
-        {
+        {
-            if (ModuleInterfaces.ContainsKey(typeof(T)))
+            if (ModuleInterfaces.ContainsKey(typeof(T)))
-            {
+            {
-                List<T> ret = new List<T>();
+                List<T> ret = new List<T>();
-                foreach (Object o in ModuleInterfaces[typeof(T)])
+                foreach (Object o in ModuleInterfaces[typeof(T)])
-                    ret.Add((T)o);
+                    ret.Add((T)o);
-                return ret.ToArray();
+                return ret.ToArray();
-            }
+            }
-            else
+            else
-            {
+            {
-                return new T[] {};
+                return new T[] {};
-            }
+            }
-        }
+        }
-        
+        
-        #endregion
+        #endregion
-        
+        
-        /// <summary>
+        /// <summary>
-        /// Call this from a region module to add a command to the OpenSim console.
+        /// Call this from a region module to add a command to the OpenSim console.
-        /// </summary>
+        /// </summary>
-        /// <param name="mod"></param>
+        /// <param name="mod"></param>
-        /// <param name="command"></param>
+        /// <param name="command"></param>
-        /// <param name="shorthelp"></param>
+        /// <param name="shorthelp"></param>
-        /// <param name="longhelp"></param>
+        /// <param name="longhelp"></param>
-        /// <param name="callback"></param>
+        /// <param name="callback"></param>
-        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
+        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
-        {
+        {
-            AddCommand(module, command, shorthelp, longhelp, string.Empty, callback);
+            AddCommand(module, command, shorthelp, longhelp, string.Empty, callback);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Call this from a region module to add a command to the OpenSim console.
+        /// Call this from a region module to add a command to the OpenSim console.
-        /// </summary>
+        /// </summary>
-        /// <param name="mod">
+        /// <param name="mod">
-        /// The use of IRegionModuleBase is a cheap trick to get a different method signature,
+        /// The use of IRegionModuleBase is a cheap trick to get a different method signature,
-        /// though all new modules should be using interfaces descended from IRegionModuleBase anyway.
+        /// though all new modules should be using interfaces descended from IRegionModuleBase anyway.
-        /// </param>
+        /// </param>
-        /// <param name="category">
+        /// <param name="category">
-        /// Category of the command.  This is the section under which it will appear when the user asks for help
+        /// Category of the command.  This is the section under which it will appear when the user asks for help
-        /// </param>
+        /// </param>
-        /// <param name="command"></param>
+        /// <param name="command"></param>
-        /// <param name="shorthelp"></param>
+        /// <param name="shorthelp"></param>
-        /// <param name="longhelp"></param>
+        /// <param name="longhelp"></param>
-        /// <param name="callback"></param>
+        /// <param name="callback"></param>
-        public void AddCommand(
+        public void AddCommand(
-            string category, IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
+            string category, IRegionModuleBase module, string command, string shorthelp, string longhelp, CommandDelegate callback)
-        {
+        {
-            AddCommand(category, module, command, shorthelp, longhelp, string.Empty, callback);
+            AddCommand(category, module, command, shorthelp, longhelp, string.Empty, callback);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Call this from a region module to add a command to the OpenSim console.
+        /// Call this from a region module to add a command to the OpenSim console.
-        /// </summary>
+        /// </summary>
-        /// <param name="mod"></param>
+        /// <param name="mod"></param>
-        /// <param name="command"></param>
+        /// <param name="command"></param>
-        /// <param name="shorthelp"></param>
+        /// <param name="shorthelp"></param>
-        /// <param name="longhelp"></param>
+        /// <param name="longhelp"></param>
-        /// <param name="descriptivehelp"></param>
+        /// <param name="descriptivehelp"></param>
-        /// <param name="callback"></param>
+        /// <param name="callback"></param>
-        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+        public void AddCommand(IRegionModuleBase module, string command, string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
-        {
+        {
-            string moduleName = "";
+            string moduleName = "";
-            if (module != null)
+            if (module != null)
-                moduleName = module.Name;
+                moduleName = module.Name;
-            AddCommand(moduleName, module, command, shorthelp, longhelp, descriptivehelp, callback);
+            AddCommand(moduleName, module, command, shorthelp, longhelp, descriptivehelp, callback);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Call this from a region module to add a command to the OpenSim console.
+        /// Call this from a region module to add a command to the OpenSim console.
-        /// </summary>
+        /// </summary>
-        /// <param name="category">
+        /// <param name="category">
-        /// Category of the command.  This is the section under which it will appear when the user asks for help
+        /// Category of the command.  This is the section under which it will appear when the user asks for help
-        /// </param>
+        /// </param>
-        /// <param name="mod"></param>
+        /// <param name="mod"></param>
-        /// <param name="command"></param>
+        /// <param name="command"></param>
-        /// <param name="shorthelp"></param>
+        /// <param name="shorthelp"></param>
-        /// <param name="longhelp"></param>
+        /// <param name="longhelp"></param>
-        /// <param name="descriptivehelp"></param>
+        /// <param name="descriptivehelp"></param>
-        /// <param name="callback"></param>
+        /// <param name="callback"></param>
-        public void AddCommand(
+        public void AddCommand(
-            string category, IRegionModuleBase module, string command,
+            string category, IRegionModuleBase module, string command,
-            string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
+            string shorthelp, string longhelp, string descriptivehelp, CommandDelegate callback)
-        {
+        {
-            if (MainConsole.Instance == null)
+            if (MainConsole.Instance == null)
-                return;
+                return;
-            bool shared = false;
+            bool shared = false;
-            if (module != null)
+            if (module != null)
-                shared = module is ISharedRegionModule;
+                shared = module is ISharedRegionModule;
-            MainConsole.Instance.Commands.AddCommand(
+            MainConsole.Instance.Commands.AddCommand(
-                category, shared, command, shorthelp, longhelp, descriptivehelp, callback);
+                category, shared, command, shorthelp, longhelp, descriptivehelp, callback);
-        }
+        }
-        public virtual ISceneObject DeserializeObject(string representation)
+        public virtual ISceneObject DeserializeObject(string representation)
-        {
+        {
-            return null;
+            return null;
-        }
+        }
-        public virtual bool AllowScriptCrossings
+        public virtual bool AllowScriptCrossings
-        {
+        {
-            get { return false; }
+            get { return false; }
-        }
+        }
-        public virtual void Start()
+        public virtual void Start()
-        {
+        {
-        }
+        }
-        public void Restart()
+        public void Restart()
-        {
+        {
-            // This has to be here to fire the event
+            // This has to be here to fire the event
-            restart handlerPhysicsCrash = OnRestart;
+            restart handlerPhysicsCrash = OnRestart;
-            if (handlerPhysicsCrash != null)
+            if (handlerPhysicsCrash != null)
-                handlerPhysicsCrash(RegionInfo);
+                handlerPhysicsCrash(RegionInfo);
-        }
+        }
-        public abstract bool CheckClient(UUID agentID, System.Net.IPEndPoint ep);
+        public abstract bool CheckClient(UUID agentID, System.Net.IPEndPoint ep);
-    }
+    }
-}
+}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 257e01e..a6a963b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -917,12 +917,14 @@ namespace OpenSim.Region.Framework.Scenes
                // in the serialization, transfer the correct name from the inventory to the
                // object itself before we rez.
                // Only do these for the first object if we are rezzing a coalescence.
-                if (i == 0)
+                // nahh dont mess with coalescence objects,
+                // the name in inventory can be change for inventory purpuses only
+                if (objlist.Count == 1)
                {
                    rootPart.Name = item.Name;
                    rootPart.Description = item.Description;
                }
+/* reverted to old code till part.ApplyPermissionsOnRez is better reviewed/fixed
                group.SetGroup(m_part.GroupID, null);
                foreach (SceneObjectPart part in group.Parts)
@@ -938,7 +940,49 @@ namespace OpenSim.Region.Framework.Scenes
                    part.ApplyPermissionsOnRez(dest, false, m_part.ParentGroup.Scene);
                }
+*/
+// old code start
+                SceneObjectPart[] partList = group.Parts;
+                group.SetGroup(m_part.GroupID, null);
+                // TODO: Remove magic number badness
+                if ((rootPart.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
+                {
+                    if (m_part.ParentGroup.Scene.Permissions.PropagatePermissions())
+                    {
+                        foreach (SceneObjectPart part in partList)
+                        {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                                part.EveryoneMask = item.EveryonePermissions;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                part.NextOwnerMask = item.NextPermissions;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                                part.GroupMask = item.GroupPermissions;
+                        }
+                        group.ApplyNextOwnerPermissions();
+                    }
+                }
+                foreach (SceneObjectPart part in partList)
+                {
+                    // TODO: Remove magic number badness
+                    if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0 || (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0) // Magic number
+                    {
+                        part.LastOwnerID = part.OwnerID;
+                        part.OwnerID = item.OwnerID;
+                        part.Inventory.ChangeInventoryOwner(item.OwnerID);
+                    }
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                        part.EveryoneMask = item.EveryonePermissions;
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                        part.NextOwnerMask = item.NextPermissions;
+                    if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                        part.GroupMask = item.GroupPermissions;
+                }
+// old code end
                rootPart.TrimPermissions();
            }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 24a92eb..8fae032 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3369,11 +3369,7 @@ namespace OpenSim.Region.Framework.Scenes
        public void SendTerseUpdateToAgentClient(ScenePresence p)
        {
-            // messy checks because a client doesn't know what presence it belongs too
- 
            IClientAPI remoteClient = p.ControllingClient;
-            if (remoteClient == null)
-                return;
            if (!remoteClient.IsActive)
                return;
@@ -3381,7 +3377,6 @@ namespace OpenSim.Region.Framework.Scenes
            if (ParcelHideThisAvatar && p.currentParcelUUID != currentParcelUUID && p.GodLevel < 200)
                return;
            //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity);
            remoteClient.SendEntityUpdate(
                this,
@@ -3507,7 +3502,7 @@ namespace OpenSim.Region.Framework.Scenes
            // If we aren't using a cached appearance, then clear out the baked textures
            if (!cachedappearance)
            {
-                Appearance.ResetAppearance();
+//                Appearance.ResetAppearance();
 // save what ????
 // maybe needed so the tryretry repair works?
                if (m_scene.AvatarFactory != null)
@@ -3530,7 +3525,7 @@ namespace OpenSim.Region.Framework.Scenes
            // send even grays
            if (cachedappearance)
            {
-                m_log.DebugFormat("[SCENE PRESENCE]: Baked textures are in the cache for {0} in {1}", Name, m_scene.Name);
+//                m_log.DebugFormat("[SCENE PRESENCE]: Baked textures are in the cache for {0} in {1}", Name, m_scene.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
                // the avatar finishes updating its appearance