diff options
| author | Melanie | 2012-10-17 00:03:02 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-17 00:03:02 +0100 |
| commit | ad60a29c9303e68717ccc057988a36da0990b0ae (patch) | |
| tree | a4e965250d291476b1449bd0e949e5e204cf0446 /OpenSim/Framework/Monitoring/MemoryWatchdog.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add optional pool for the UDPPacketBuffer objects that handle all incoming UD... (diff) | |
| download | opensim-SC-ad60a29c9303e68717ccc057988a36da0990b0ae.zip opensim-SC-ad60a29c9303e68717ccc057988a36da0990b0ae.tar.gz opensim-SC-ad60a29c9303e68717ccc057988a36da0990b0ae.tar.bz2 opensim-SC-ad60a29c9303e68717ccc057988a36da0990b0ae.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Framework/Monitoring/MemoryWatchdog.cs')
0 files changed, 0 insertions, 0 deletions