aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-10/+10
| | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
|
* Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵Justin Clark-Casey (justincc)2012-02-241-1/+1
| | | | returns and for consistency.
* Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
| | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-181-1/+3
| | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
* Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)2012-01-311-1/+1
| | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
* Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-072-11/+5
| | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0512-15/+210
| | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
|
* With "debug http 1", show the path with the query string instead of just the ↵Justin Clark-Casey (justincc)2011-11-291-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-291-12/+43
| | | | non-event queue inbound http requests to a simulator
* fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-151-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-151-1/+8
|
* send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
|
* Add number of milliseconds since last update to "show threads"Justin Clark-Casey (justincc)2011-11-151-3/+7
|
* Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
|
* Restart the event queue worker threads that I accidentally disabled earlier ↵Justin Clark-Casey (justincc)2011-10-251-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 consistencyJustin Clark-Casey (justincc)2011-10-251-0/+5
|
* Add "threads abort <thread-id>" simulator console command that allows us to ↵Justin Clark-Casey (justincc)2011-10-251-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-254-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)
* Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
| | | | Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
* Fix bugs in EventQueueGetModule.ClientClosed() and ↵Justin Clark-Casey (justincc)2011-10-242-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.
* flip master version up to 0.7.3Justin Clark-Casey (justincc)2011-10-071-1/+1
|
* Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2011-09-301-1/+1
| | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* 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 ↵Justin Clark-Casey (justincc)2011-08-221-11/+6
| | | | BaseHttpServer.RemoveLLSDHandler()
* 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
|
* Make default serverside_object_permissions = true since this better matches ↵Justin Clark-Casey (justincc)2011-07-011-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-011-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-011-5/+4
| | | | bin/.version doesn't necessary have to be a git hash
* First pass at making the V2 map work. Standalones only for now. There are ↵Diva Canto2011-06-121-2/+2
| | | | some issues with the zoom level -- TBD.
* Adding ssl supportBlueWall2011-05-051-0/+14
| | | | | Adding ssl support for "Out of Band" applications such as the remote admin module or Robust services
* Upped VERSION_NUMBER in master to 0.7.2.Diva Canto2011-04-241-1/+1
|
* Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-201-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.
* Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵Diva Canto2011-04-123-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-071-1/+1
|
* bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes ↵Justin Clark-Casey (justincc)2011-04-061-1/+1
| | | | branch now exists.
* Thanks Kevin Cozens for a patch that:BlueWall2011-03-171-1/+1
| | | | Fixes several spelling mistakes
* 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
| | | | | request method and target are reported correctly and drop the txn id as it's empty 99% of the time.
* Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-091-1/+0
| | | | This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
* XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386Diva Canto2011-02-161-1/+13
|
* Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-0/+32
| | | | | show circuits: shows the lists of agent circuit data show http-handlers: shows the currently registered http handlers
* Fix "set log level" to once again display current log level if it's not ↵Justin Clark-Casey (justincc)2011-02-041-12/+15
| | | | | | given a parameter This addresses http://opensimulator.org/mantis/view.php?id=5345