aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/BaseOpenSimServer.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-1/+0
| |
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
* | Merge branch 'master' into careminsterMelanie2012-07-121-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-111-2/+2
| | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* | Merge branch 'master' into careminsterMelanie2012-06-261-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * If starting scripts on initial sim start, provide INFO level log feedback ↵Justin Clark-Casey (justincc)2012-06-221-1/+1
| | | | | | | | | | | | | | each time 50 scripts have been started. This is to provide an indication of what's happening now that the default isn't to report every single script start. Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
* | Merge branch 'master' into careminsterMelanie2012-06-211-1/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove STARTUP COMPLETE message from the startuplogo.txt file and into main ↵Justin Clark-Casey (justincc)2012-06-201-1/+3
| | | | | | | | logging
| * Comment out the neighbour and land in connectors from info logging that they ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | are starting up
* | Merge branch 'master' into careminsterMelanie2012-03-181-6/+10
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
| |
| * Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| | | | | | | | However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
| * Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)2012-03-161-6/+2
| | | | | | | | printed out periodically)
* | Merge branch 'master' into careminsterMelanie2012-03-081-10/+10
|\ \ | |/
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-02-241-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.
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-01-311-1/+1
|\ \ | |/
| * 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
* | Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-1/+1
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into bigmergeMelanie2011-11-171-3/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * 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
| |
| * Add number of milliseconds since last update to "show threads"Justin Clark-Casey (justincc)2011-11-151-3/+7
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-261-0/+30
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * 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.
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-051-17/+40
|\ \ | |/
| * 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-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-041-12/+15
| | | | | | | | | | | | given a parameter This addresses http://opensimulator.org/mantis/view.php?id=5345
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-6/+30
|\ \ | |/
| * Update the "config get <section> <key>" command to "config get [<section>] ↵Justin Clark-Casey (justincc)2011-01-211-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 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
| |
* | Remove "OpenSimulator" from startup messageMelanie2010-11-091-1/+1
|/
* Fix "show threads" to show threads now being managed by ↵Justin Clark-Casey (justincc)2010-09-141-16/+10
| | | | OpenSim.Framework.Watchdog
* add a smidgen more log debug information in the form of the operating system ↵Justin Clark-Casey (justincc)2010-05-281-1/+5
| | | | version
* Apply patch to reduce git revision text length if running sim directly from ↵Justin Clark-Casey (justincc)2009-11-271-1/+1
| | | | | | | a git tree See http://opensimulator.org/mantis/view.php?id=4030 Thanks ChrisDown (and Bruce for reporting)
* Formatting cleanup.Jeff Ames2009-10-191-1/+1
|
* Bug fix.Diva Canto2009-10-071-2/+6
|
* Printout one more field in show threads, but this won't buy us much.Diva Canto2009-10-071-1/+2
|
generated by cgit v1.1 at 2024-12-15 04:13:46 +0000