| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ |
|
| * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -1/+1 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -57/+55 |
|\ \
| |/ |
|
| * | read m_rpcHandlersKeepAlive under appropriate lock | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| * | oops, fix build break from last commit | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -12/+8 |
| * | improve locking of m_agentHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -10/+10 |
| * | improve locking of m_HTTPHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+2 |
| * | improve locking of m_streamHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| * | remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSD... | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -11/+6 |
| * | improve locking of m_llsdHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -30/+32 |
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -3/+3 |
| * | improve locking of m_rpcHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -1/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -17/+40 |
|\ \
| |/ |
|
| * | Make default serverside_object_permissions = true since this better matches u... | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -11/+0 |
| * | If OpenSim has been built from a git tree, then include version information a... | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -4/+39 |
| * | refactor: rename gitCommitFileName to manualVersionFileName since bin/.versio... | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -5/+4 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | First pass at making the V2 map work. Standalones only for now. There are som... | Diva Canto | 2011-06-12 | 1 | -2/+2 |
* | | Some additional protection, it seems that responsedata needs to be locked, bu... | Tom | 2011-05-26 | 1 | -5/+14 |
* | | If a response cannot be obtained (the script has no handler) return a more fr... | Tom | 2011-05-17 | 1 | -4/+18 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -0/+14 |
|\ \
| |/ |
|
| * | Adding ssl support | BlueWall | 2011-05-05 | 1 | -0/+14 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Upped VERSION_NUMBER in master to 0.7.2. | Diva Canto | 2011-04-24 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Get Viewer 2 voice working with OpenSim. | Justin Clark-Casey (justincc) | 2011-04-20 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 3 | -460/+0 |
|\ \
| |/ |
|
| * | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open... | Diva Canto | 2011-04-12 | 3 | -445/+0 |
| * | Revert master version number to 0.7.1 for now to make merging easier. | Justin Clark-Casey (justincc) | 2011-04-07 | 1 | -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-06 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-21 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | Thanks Kevin Cozens for a patch that: | BlueWall | 2011-03-17 | 1 | -1/+1 |
| * | minor: bring comment into line with code reality | Justin Clark-Casey (justincc) | 2011-03-16 | 1 | -1/+1 |
| * | Up the timeout on slow requests to 3000 to stop console spam. Make sure | Melanie | 2011-03-14 | 1 | -5/+21 |
* | | Up the timeout on slow requests to 3000 to stop console spam. Make sure | Melanie | 2011-03-14 | 1 | -5/+21 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 1 | -1/+0 |
|\ \
| |/ |
|
| * | Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -1/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-19 | 1 | -1/+13 |
|\ \
| |/ |
|
| * | XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386 | Diva Canto | 2011-02-16 | 1 | -1/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+32 |
|\ \
| |/ |
|
| * | Added a couple of console commands to help diagnose issues: | Diva Canto | 2011-02-05 | 1 | -0/+32 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -12/+15 |
|\ \
| |/ |
|
| * | Fix "set log level" to once again display current log level if it's not given... | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -12/+15 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 2 | -8/+33 |
|\ \
| |/ |
|
| * | Update the "config get <section> <key>" command to "config get [<section>] [<... | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -0/+14 |
| * | make "show info" and "show version" show the same version text | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -4/+7 |
| * | add current console log level to "show info" | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -2/+9 |
| * | minor: make "show info" help slightly clearer | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -1/+1 |
| * | With mic's permission, adjust long call time info messages to 500ms from 200ms | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -2/+3 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 1 | -1/+15 |
|\ \
| |/ |
|