ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2016-12-02 13:51:30 +00:00
parent ebbb918404 1fdd71f856
commit b981ac42bc
10 changed files with 174 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -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);
}