aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Resolve merge commits, stage 1Tom2011-09-041-57/+55
|\ \ | |/
| * read m_rpcHandlersKeepAlive under appropriate lockJustin Clark-Casey (justincc)2011-08-221-2/+4
| * oops, fix build break from last commitJustin Clark-Casey (justincc)2011-08-221-12/+8
| * improve locking of m_agentHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-10/+10
| * improve locking of m_HTTPHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+2
| * improve locking of m_streamHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+4
| * remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSD...Justin Clark-Casey (justincc)2011-08-221-11/+6
| * improve locking of m_llsdHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-30/+32
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-221-3/+3
| * improve locking of m_rpcHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-1/+2
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-051-17/+40
|\ \ | |/
| * Make default serverside_object_permissions = true since this better matches u...Justin Clark-Casey (justincc)2011-07-011-11/+0
| * If OpenSim has been built from a git tree, then include version information a...Justin Clark-Casey (justincc)2011-07-011-4/+39
| * refactor: rename gitCommitFileName to manualVersionFileName since bin/.versio...Justin Clark-Casey (justincc)2011-07-011-5/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-2/+2
|\ \ | |/
| * First pass at making the V2 map work. Standalones only for now. There are som...Diva Canto2011-06-121-2/+2
* | Some additional protection, it seems that responsedata needs to be locked, bu...Tom2011-05-261-5/+14
* | If a response cannot be obtained (the script has no handler) return a more fr...Tom2011-05-171-4/+18
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-081-0/+14
|\ \ | |/
| * Adding ssl supportBlueWall2011-05-051-0/+14
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-251-1/+1
|\ \ | |/
| * Upped VERSION_NUMBER in master to 0.7.2.Diva Canto2011-04-241-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-211-1/+1
|\ \ | |/
| * Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-201-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-173-460/+0
|\ \ | |/
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-123-445/+0
| * Revert master version number to 0.7.1 for now to make merging easier.Justin Clark-Casey (justincc)2011-04-071-1/+1
| * bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch...Justin Clark-Casey (justincc)2011-04-061-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-212-2/+2
|\ \ | |/
| * Thanks Kevin Cozens for a patch that:BlueWall2011-03-171-1/+1
| * minor: bring comment into line with code realityJustin Clark-Casey (justincc)2011-03-161-1/+1
| * Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* | Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-1/+0
|\ \ | |/
| * Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-091-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-191-1/+13
|\ \ | |/
| * XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386Diva Canto2011-02-161-1/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+32
|\ \ | |/
| * Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-0/+32
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-12/+15
|\ \ | |/
| * Fix "set log level" to once again display current log level if it's not given...Justin Clark-Casey (justincc)2011-02-041-12/+15
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-232-8/+33
|\ \ | |/
| * Update the "config get <section> <key>" command to "config get [<section>] [<...Justin Clark-Casey (justincc)2011-01-211-0/+14
| * make "show info" and "show version" show the same version textJustin Clark-Casey (justincc)2011-01-211-4/+7
| * add current console log level to "show info"Justin Clark-Casey (justincc)2011-01-211-2/+9
| * minor: make "show info" help slightly clearerJustin Clark-Casey (justincc)2011-01-201-1/+1
| * With mic's permission, adjust long call time info messages to 500ms from 200msJustin Clark-Casey (justincc)2011-01-191-2/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-061-1/+15
|\ \ | |/
| * Added more performance checks to the HTTP server. Each requestMic Bowman2011-01-051-1/+15
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-2/+2
|\ \ | |/