aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-232-31/+67
|\
| * Tighten up OpenSim.Framework.Cache locking to avoid race conditions.Justin Clark-Casey (justincc)2012-08-201-30/+53
| * Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-0/+14
* | Merge branch 'master' into careminsterMelanie2012-08-183-3/+60
|\ \ | |/
| * When reporting a thread timeout, create a copy of the info rather than passin...Justin Clark-Casey (justincc)2012-08-181-1/+14
| * adding a clip method to handle Vector3 objects to enable a minor amount of re...SignpostMarv2012-08-171-0/+6
| * enables configurable minimum sizes for physical & non-physical primsSignpostMarv2012-08-151-2/+40
* | Merge branch 'master' into careminsterMelanie2012-08-161-5/+26
|\ \ | |/
| * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-151-5/+26
| * Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-145-3/+21
* | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-151-1/+1
* | Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-145-3/+21
* | Merge branch 'master' into careminsterMelanie2012-08-042-35/+72
|\ \ | |/
| * Fix old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-032-35/+72
* | Merge branch 'master' into careminsterMelanie2012-07-2815-19/+172
|\ \ | |/
| * making first run more resilient to bad input (loop until good input, rather t...SignpostMarv2012-07-271-7/+19
| * minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ...Justin Clark-Casey (justincc)2012-07-271-1/+1
| * Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-1/+0
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring wi...Justin Clark-Casey (justincc)2012-07-256-2/+6
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-258-11/+9
| * Add MemoryWatchdog class missing from git master a1e9964Justin Clark-Casey (justincc)2012-07-251-0/+129
| * Correct churn stat from MB/s from KB/sJustin Clark-Casey (justincc)2012-07-251-1/+1
| * Add experimental "OpenSim object memory churn" statistics to output of region...Justin Clark-Casey (justincc)2012-07-252-8/+15
| * Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-0/+8
| * Committing Avination's memleak fix-a-thon, installment #2Melanie2012-07-231-1/+10
| * Commiting Avination's memleak fix-a-thon, installment #1Melanie2012-07-231-4/+8
* | Merge branch 'avination' into careminsterMelanie2012-07-201-1/+1
|\ \
| * | Fix slow loading of task inventoryMelanie2012-07-191-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-07-191-0/+5
|\ \ \ | |/ / |/| / | |/
| * Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled...Justin Clark-Casey (justincc)2012-07-191-0/+5
* | Merge branch 'ubitwork' into avinationMelanie2012-07-171-10/+47
|\ \
| * | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
* | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-7/+6
|/ /
* | Merge branch 'avination' into careminsterMelanie2012-07-161-1/+3
|\ \
| * | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-07-134-4/+7
|\ \ \ | | |/ | |/|
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-132-3/+2
| * | Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.Re...Justin Clark-Casey (justincc)2012-07-121-1/+0
| * | Extend "show circuits" to show circuit code, ip and viewer name.Justin Clark-Casey (justincc)2012-07-121-0/+5
* | | Merge branch 'master' into careminsterMelanie2012-07-126-27/+19
|\ \ \ | |/ /
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-116-27/+19
* | | Merge branch 'avination' into careminsterMelanie2012-07-113-9/+38
|\ \ \ | | |/ | |/|
| * | stop keeping references to objects on released itemsUbitUmarov2012-07-111-1/+10
| * | Make sure handles stay intact when removing from the MinHeapMelanie2012-07-111-5/+8
| * | clear released minheap items so they don't keep holding references toUbitUmarov2012-07-111-0/+1
| * | add some more memory information to StatsCollectorUbitUmarov2012-07-101-4/+20
* | | Merge branch 'master' into careminsterMelanie2012-07-111-2/+22
|\ \ \ | | |/ | |/|
| * | Log warning if time between invocations of the watchdog thread is twice the t...Justin Clark-Casey (justincc)2012-07-051-2/+22
* | | Merge branch 'avination' into careminsterMelanie2012-07-064-3/+252
|\ \ \ | | |/ | |/|
| * | Convert the slow request queue into a regular queue and add some cleanupMelanie2012-07-061-4/+18