aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | |/ /
| * | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752Justin Clark-Casey (justincc)2012-06-141-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-141-2/+0
|\ \ \ | |/ /
| * | Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-131-2/+0
* | | Merge branch 'master' into careminsterMelanie2012-06-135-313/+169
|\ \ \ | |/ /
| * | Don't include time to transmit response back to requester when assessing slow...Justin Clark-Casey (justincc)2012-06-135-314/+169
* | | Merge branch 'master' into careminsterMelanie2012-06-122-6/+20
|\ \ \ | |/ /
| * | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-121-0/+7
| * | Set IClientAPI.IsActive = false early on client removal due to ack timeout ra...Justin Clark-Casey (justincc)2012-06-121-6/+3
| * | In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already a...Justin Clark-Casey (justincc)2012-06-121-6/+16
* | | Merge branch 'master' into careminsterMelanie2012-06-091-15/+2
|\ \ \ | |/ /
| * | Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-081-15/+2
* | | Merge branch 'master' into careminsterMelanie2012-06-073-18/+26
|\ \ \ | |/ /
| * | Make change to fix Windows buildsBlueWall2012-06-071-1/+1
| * | Allow the thread watchdog to accept an alarm method that is invoked if the ti...Justin Clark-Casey (justincc)2012-06-072-17/+25
* | | Remove useless logging of a bare-names stack trace. It's meaninglessMelanie2012-06-061-32/+57
* | | Merge branch 'master' into careminsterMelanie2012-05-273-146/+367
|\ \ \ | |/ /
| * | adding status codes from rfc 6585SignpostMarv2012-05-241-2/+22
| * | porting IDE tooltip-friendly documentation tweaks from Aurora-SimSignpostMarv2012-05-241-134/+223
| * | refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTabl...Justin Clark-Casey (justincc)2012-05-231-9/+9
| * | Add ConsoleDisplayList for more consistent formatting of console output in li...Justin Clark-Casey (justincc)2012-05-231-0/+112
| * | refactor: rename ConsoleTable -> ConsoleDisplayTable for clarityJustin Clark-Casey (justincc)2012-05-231-2/+2