aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'avination' into careminsterMelanie2012-06-293-5/+22
|\ \ \ | | |/ | |/|
| * | Fix llRegionSayTo the right wayMelanie2012-06-281-0/+7
| * | Add an event to the poll service manager thread to allow starting itMelanie2012-06-262-4/+14
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-281-20/+0
* | | Merge branch 'master' into careminsterMelanie2012-06-281-0/+15
|\ \ \ | | |/ | |/|
| * | Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.Justin Clark-Casey (justincc)2012-06-261-0/+15
* | | Merge branch 'master' into careminsterMelanie2012-06-263-6/+12
|\ \ \ | |/ /
| * | Avoid a race condition where an incoming request to a script external URL can...Justin Clark-Casey (justincc)2012-06-222-5/+11
| * | If starting scripts on initial sim start, provide INFO level log feedback eac...Justin Clark-Casey (justincc)2012-06-221-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-212-4/+4
|\ \ \ | |/ /
| * | Remove STARTUP COMPLETE message from the startuplogo.txt file and into main l...Justin Clark-Casey (justincc)2012-06-201-1/+3
| * | Comment out the neighbour and land in connectors from info logging that they ...Justin Clark-Casey (justincc)2012-06-201-1/+1
| * | Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses would...Justin Clark-Casey (justincc)2012-06-161-3/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | |/ /
| * | Put all debug console commands into a single Debug section rather than scatte...Justin Clark-Casey (justincc)2012-06-151-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-152-29/+195
|\ \ \ | |/ /
| * | Make the "debug http" command available for robust as well as the simulator. ...Justin Clark-Casey (justincc)2012-06-152-4/+59
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ...Justin Clark-Casey (justincc)2012-06-152-11/+61
| * | When setting debug http level, do this for all known http servers, not just t...Justin Clark-Casey (justincc)2012-06-152-21/+40
| * | Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpeci...Justin Clark-Casey (justincc)2012-06-151-4/+27
| * | Shuffle "debug http" levels so that 1 and 2 now cause different levels of war...Justin Clark-Casey (justincc)2012-06-141-8/+27