Merge branch 'master' into httptests

1 files changed, 2 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6cdf6f6..ce7ee98 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -619,11 +619,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_entityProps = new PriorityQueue(1);
             m_killRecord.Clear();
             GroupsInView.Clear();
-//            m_scene = null; can't do this unless checks are added everywhere due to workitems already in pools
 
-            //m_log.InfoFormat("[CLIENTVIEW] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
-            //GC.Collect();
-            //m_log.InfoFormat("[CLIENTVIEW] Memory post GC {0}", System.GC.GetTotalMemory(true));
+            if(m_scene.GetNumberOfClients() == 0)
+                GC.Collect();          
         }
 
         public void Kick(string message)
@@ -2996,7 +2994,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 return;
             }
 
-            int WearableOut = 0;
             bool isWearable = false;
 
             isWearable = ((AssetType) req.AssetInf.Type ==
@@ -8563,7 +8560,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // surrounding scene
                 if ((ImageType)block.Type == ImageType.Baked)
                     args.Priority *= 2.0f;
-                int wearableout = 0;
 
                 ImageManager.EnqueueReq(args);
             }