| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | ||||
| | * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled | ||||
| * | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -11/+6 |
| | | | | | | | | | BaseHttpServer.RemoveLLSDHandler() | ||||
| | * | 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 ↵ | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -11/+0 |
| | | | | | | | | | | | | | user expectations. It also matches the default setting in the OpenSim.ini.example file | ||||
| | * | If OpenSim has been built from a git tree, then include version information ↵ | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -4/+39 |
| | | | | | | | | | | | | | automatically by dereferencing .git/HEAD A blank bin/.version file will stop this being displayed. | ||||
| | * | refactor: rename gitCommitFileName to manualVersionFileName since ↵ | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -5/+4 |
| | | | | | | | | | bin/.version doesn't necessary have to be a git hash | ||||
| * | | 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 ↵ | Diva Canto | 2011-06-12 | 1 | -2/+2 |
| | | | | | | | | | some issues with the zoom level -- TBD. | ||||
| * | | Some additional protection, it seems that responsedata needs to be locked, ↵ | Tom | 2011-05-26 | 1 | -5/+14 |
| | | | | | | | | | but I can't immediately see where it's being accessed from another thread. For now, this will protect the server | ||||
| * | | If a response cannot be obtained (the script has no handler) return a more ↵ | Tom | 2011-05-17 | 1 | -4/+18 |
| | | | | | | | | | friendly 500 error instead of crashing out with a null reference and letting the connection hang | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -0/+14 |
| |\ \ | |/ | |||||
| | * | Adding ssl support | BlueWall | 2011-05-05 | 1 | -0/+14 |
| | | | | | | | | | | | Adding ssl support for "Out of Band" applications such as the remote admin module or Robust services | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is. | ||||
| * | | 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 ↵ | Diva Canto | 2011-04-12 | 3 | -445/+0 |
| | | | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. | ||||
| | * | 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 ↵ | Justin Clark-Casey (justincc) | 2011-04-06 | 1 | -1/+1 |
| | | | | | | | | | branch now exists. | ||||
| * | | 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 |
| | | | | | | | | | Fixes several spelling mistakes | ||||
| | * | 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 |
| | | | | | | | | | | | request method and target are reported correctly and drop the txn id as it's empty 99% of the time. | ||||
| * | | Up the timeout on slow requests to 3000 to stop console spam. Make sure | Melanie | 2011-03-14 | 1 | -5/+21 |
| | | | | | | | | | | | request method and target are reported correctly and drop the txn id as it's empty 99% of the time. | ||||
| * | | 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 |
| | | | | | | | | | This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement. | ||||
| * | | 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 |
| | | | | | | | | | | | show circuits: shows the lists of agent circuit data show http-handlers: shows the currently registered http handlers | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -12/+15 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| | * | Fix "set log level" to once again display current log level if it's not ↵ | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -12/+15 |
| | | | | | | | | | | | | | given a parameter This addresses http://opensimulator.org/mantis/view.php?id=5345 | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | | [<key>]" The config get command shows a current config value on the console. Now, if <key> is omitted then all the values for the given section are printed. If <section> is ommitted then all sections and all keys are printed. Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues | ||||
| | * | 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 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |