aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Fix the boo-booMelanie2012-07-051-3/+3
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-052-11/+34
| * | use the pollEvent timeout paramenter on poolingUbitUmarov2012-07-041-4/+7
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ...UbitUmarov2012-07-042-2/+5
| * | *test2* http poll: increased again the pool rate do 10/s but increased timeou...UbitUmarov2012-07-041-2/+2
| * | *test* slow http retries pool rate to original 1sUbitUmarov2012-07-041-1/+1
| * | *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued ...UbitUmarov2012-07-012-0/+206
* | | Merge branch 'master' into careminsterMelanie2012-07-051-3/+3
|\ \ \ | | |/ | |/|
| * | refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS ...Justin Clark-Casey (justincc)2012-07-041-3/+3
| * | Add preservation of running state of scripts when drag-copying.Melanie2012-07-011-0/+12
* | | Merge branch 'master' into careminsterMelanie2012-07-012-2/+2
|\ \ \ | |/ /
| * | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-302-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-06-291-0/+5
|\ \ \ | |/ /
| * | Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in...Justin Clark-Casey (justincc)2012-06-291-0/+5