| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 1 | -15/+48 |
| |\ | |||||
| | * | On "show caps", stop excluding the seed cap but do exclude it elsewhere | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+3 |
| | | | |||||
| | * | With "debug http 1", show the path with the query string instead of just the ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -21/+21 |
| | | | | | | | | | | | | | path. Also simplifies debug levels to just 0 and 1 | ||||
| | * | Add "debug http" command for currently simple extra debug logging of ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -12/+43 |
| | | | | | | | | | non-event queue inbound http requests to a simulator | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 2 | -3/+21 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| | * | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -4/+8 |
| | | | | | | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in. | ||||
| | * | improve formatting of "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+8 |
| | | | |||||
| | * | send a watchdog heartbeat for a poll worker thread when it's actually run | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -0/+3 |
| | | | |||||
| | * | Add number of milliseconds since last update to "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -3/+7 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -8/+6 |
| |\ \ | |/ | |||||
| | * | Remove unused avariable in PollServiceRequestManager | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -8/+6 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 5 | -19/+138 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | * | Restart the event queue worker threads that I accidentally disabled earlier ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -7/+9 |
| | | | | | | | | | | | | | today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite) | ||||
| | * | minor: add "threads show" as synonym for "show threads" for consistency | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 |
| | | | |||||
| | * | Add "threads abort <thread-id>" simulator console command that allows us to ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+25 |
| | | | | | | | | | | | | | abort a watchdog managed thread. This is for diagnostic purposes. | ||||
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 4 | -19/+106 |
| | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
| * | | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+2 |
| |\ \ | |/ | |||||
| | * | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -12/+2 |
| | | | | | | | | | Remove() presumably does this check anyway since it just returns false if the key is not in the collection. | ||||
| * | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+9 |
| |\ \ | |/ | |||||
| | * | Fix bugs in EventQueueGetModule.ClientClosed() and ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -5/+9 |
| | | | | | | | | | | | | | BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler Actually doing the tear down appear to have no ill effects with region crossing and teleport. | ||||
| * | | Adjust CM version tag | Melanie | 2011-10-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | flip master version up to 0.7.3 | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | 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 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |