Commit Graph

162 Commits (9aacdca653e6197430b65c2a81d3af8c7081865b)

Author SHA1 Message Date
Justin Clark-Casey (justincc) b817c337dc On Windows automatically load the correct native ODE library depending on 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.
2012-02-18 00:33:52 +00:00
Melanie 727ddffb71 Merge branch 'master' into careminster 2012-01-31 21:53:32 +00:00
Justin Clark-Casey (justincc) 1505c22995 Use Environment.TickCount & Int32.MaxValue; instead of 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
2012-01-31 21:09:26 +00:00
Justin Clark-Casey (justincc) 4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead 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.
2011-12-05 20:44:20 +00:00
Melanie bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie 31736b1aac Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc) aea547cd11 fix build break on UserManagementModule.
This also adds time since started to "show threads".  Unfortunately these two changes got mixed in.
2011-11-15 23:24:51 +00:00
Justin Clark-Casey (justincc) 29eb3b2eb5 improve formatting of "show threads" 2011-11-15 22:51:12 +00:00
Justin Clark-Casey (justincc) 7db38a351c Add number of milliseconds since last update to "show threads" 2011-11-15 21:49:13 +00:00
Melanie fd22159d0c Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc) a4d4f54848 minor: add "threads show" as synonym for "show threads" for consistency 2011-10-25 20:59:27 +01:00
Justin Clark-Casey (justincc) 968cae6c17 Add "threads abort <thread-id>" simulator console command that allows us to abort a watchdog managed thread.
This is for diagnostic purposes.
2011-10-25 20:49:46 +01:00
root 47cf9c8fe0 Merge branch 'master' into careminster-presence-refactor 2011-07-05 04:01:59 +01:00
Justin Clark-Casey (justincc) fba961c63f Make default serverside_object_permissions = true since this better matches user expectations.
It also matches the default setting in the OpenSim.ini.example file
2011-07-01 23:06:46 +01:00
Justin Clark-Casey (justincc) e765759f50 If OpenSim has been built from a git tree, then include version information automatically by dereferencing .git/HEAD
A blank bin/.version file will stop this being displayed.
2011-07-01 22:48:00 +01:00
Justin Clark-Casey (justincc) 759e855566 refactor: rename gitCommitFileName to manualVersionFileName since bin/.version doesn't necessary have to be a git hash 2011-07-01 21:47:30 +01:00
Melanie 3889e68c54 Merge branch 'master' into careminster-presence-refactor
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
2011-02-07 22:08:53 +00:00
Justin Clark-Casey (justincc) ba8826d2b8 Fix "set log level" to once again display current log level if it's not given a parameter
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
Melanie 105deab601 Merge branch 'master' into careminster-presence-refactor 2011-01-23 23:29:25 +00:00
Justin Clark-Casey (justincc) cb14e1d272 Update the "config get <section> <key>" command to "config get [<section>] [<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
2011-01-21 23:59:55 +00:00
Justin Clark-Casey (justincc) e44ceaaea3 make "show info" and "show version" show the same version text 2011-01-21 23:07:19 +00:00
Justin Clark-Casey (justincc) 43f948d691 add current console log level to "show info" 2011-01-21 23:05:53 +00:00
Justin Clark-Casey (justincc) b0aebc6f3d minor: make "show info" help slightly clearer 2011-01-20 21:41:48 +00:00
Melanie ccfbce3176 Remove "OpenSimulator" from startup message 2010-11-09 16:07:43 +01:00
Justin Clark-Casey (justincc) 609375bf37 Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog 2010-09-14 22:24:11 +01:00
Justin Clark-Casey (justincc) 565db4635f add a smidgen more log debug information in the form of the operating system version 2010-05-28 18:30:33 +01:00
Justin Clark-Casey (justincc) 251fd8c948 Apply patch to reduce git revision text length if running sim directly from a git tree
See http://opensimulator.org/mantis/view.php?id=4030
Thanks ChrisDown (and Bruce for reporting)
2009-11-27 18:24:21 +00:00
Jeff Ames 0d29614ca1 Formatting cleanup. 2009-10-19 08:58:03 +09:00
Diva Canto 29f03d95f3 Bug fix. 2009-10-07 19:20:34 -07:00
Diva Canto ab3bfca546 Printout one more field in show threads, but this won't buy us much. 2009-10-07 17:29:21 -07:00
John Hurliman 2519f071f2 Fixing a few compile errors in the previous commit 2009-10-06 02:50:59 -07:00
Diva Canto 2753f4d62c * GridServerPostHandler.cs: Try/catch in Handle
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
2009-10-05 16:06:21 -07:00
Jeff Ames ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Jeff Ames 50f29752f5 Formatting cleanup. Add copyright headers. 2009-08-13 11:48:39 +09:00
Chris Down bb64906a9c Enable the console show version command and the viewer about command, to show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script:
git log -n 1 --pretty="format:%h: %ci" > bin/.version

This command can also be run manually to create the bin/.version file.

This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format.
If a full commit hash is required then change %h to %H

The logic that is used to extract the deprecated svn revision is still included.
It will be removed at a future date
2009-08-11 17:09:35 +01:00
Jeff Ames a23d64dec1 Formatting cleanup. 2009-06-10 04:28:56 +00:00
Jeff Ames 840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Melanie Thielker 4065ebff15 Remove the pre-log4net, discrete output methods from the consoles 2009-05-20 13:50:33 +00:00
Jeff Ames e0bc5c5db2 Add copyright headers, formatting cleanup. 2009-05-20 01:32:06 +00:00
Charles Krinke a5feb0682a Thank you kindly, BlueWall sir, for a patch that:
Adding a jsonp wrapper to the user supplied status report 
uri if the key "callback" exists. It will work with many 
javascript toolkits to provide an ajax callback to allow 
the browser to update stats reports without the 
intervention of an intermediate server.
2009-05-13 01:27:23 +00:00
Melanie Thielker ec0d2c28fa Committing the changed tree 2009-05-04 20:19:21 +00:00
Melanie Thielker acfb5051cd Intermediate commit. WILL NOT COMPILE! 2009-05-04 20:15:39 +00:00
Melanie Thielker 1b877234da Refactor. Make ConsoleBase a true base class. Create CommandConsole as a simple
console capable of processing commands. Create LocalConsole as a console
that uses cursor control and context help. Precursor to a distributed
console system for the new grid services. No functional change intended :)
2009-05-04 12:15:55 +00:00
Charles Krinke 280d2cbf4a Thank you kindly, BlueWall, for a patch that:
Move json stats to non-published resource name
Remove well-known resource name for json stats, 
creating dynamic uris with private keys and add 
a user configurable resource name for region owner usage.
2009-05-02 16:28:30 +00:00
Dahlia Trimble 4792e6139a Thanks Bluewall for Mantis #3519: a patch that adds simulator uptime and version to REST/json statistics reporting 2009-04-25 05:06:01 +00:00
Jeff Ames 6aa5d3904d Add copyright headers. Formatting cleanup. 2009-04-22 00:48:56 +00:00
Charles Krinke b4cb45bb79 Fixes Mantis # 3469. Thank you kindly, BlueWall, for a patch that:
This patch adds extended status reporting with the url 
http://server:port/simstatusx/ [^] . The data is returned 
in json format as "text/plain" type.
2009-04-17 21:48:48 +00:00
Melanie Thielker 76ca096384 Add a PIDFile in [Startup], which the PID will be written to 2009-04-01 12:13:42 +00:00
Justin Clarke Casey 4550093353 * Fix http://opensimulator.org/mantis/view.php?id=3193
* Make it possible once again to set a console log level threshold in OpenSim.exe.config
2009-02-19 17:57:40 +00:00
lbsa71 801da4346a * optimized usings. 2009-02-12 09:53:12 +00:00
Melanie Thielker 9bfbfa381a Add proper handling for shared vs. unshared modules to the command
interface. Shared modules will now only get added once, so the command
handler is called once per module, not once per scene. Removal of scenes
has no adverse effects. Nonshared modules will be called for each scene.
2009-02-10 23:15:48 +00:00
Justin Clarke Casey d1d93fae6c * Restore show information for the OpenSim region server (version, info, threads, etc.) 2009-02-09 18:11:09 +00:00
Melanie Thielker 54c6a920ba Replace the console for all OpenSim apps with a new console featuring command
line editing, context sensitive help (press ? at any time), command line
history, a new plugin command system and new appender features thet let you
type while the console is scrolling. Seamlessly integrates the ICommander
interfaces.
2009-02-07 12:25:39 +00:00
Justin Clarke Casey 732cd838b1 * Make existing module commanders register as help topics
* Typing help will now give a list of these topics at the top (as well as the rest of the current help stuff)
* Typing help <topic> will give information about commands specific to that topic
2009-02-05 21:35:59 +00:00
lbsa71 56f1b03cd0 * Added "show queues" command that shows throttling queues for all clients.
*** This only works for LLCLientView at the moment ***
2008-12-18 13:16:41 +00:00
MW 11169c0e71 Made BaseOpenSimServer.ShutdownSpecific() public. As the OpenSimBase.Shutdown() includes a Environment.Exit(0); which is not always wanted when shutting down, like from a windows service. 2008-12-02 11:40:22 +00:00
Melanie Thielker f518ca7feb Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
2008-11-19 06:25:34 +00:00
Melanie Thielker 3234472d62 Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
2008-11-19 06:15:21 +00:00
Justin Clarke Casey c25a0ea792 * Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch.
* Appears to be okay on a very short sniff test
* Source code will be placed in opensim-libs shortly
2008-11-17 21:00:34 +00:00
Justin Clarke Casey 072624b19d * minor: add interface version to 'show version' command output 2008-11-17 20:22:22 +00:00
Justin Clarke Casey 97816f8c90 * Implement basic region filtering as described in https://lists.berlios.de/pipermail/opensim-dev/2008-November/003468.html
* This is done by sending a 'major interface version' number on sim registration.  Developers must increment this every time they make a change that would make the previous 
OpenSim revision failure incompatible with the new one (non-fatal incompatibilities are fine).
* This number resides in OpenSim.Framework.Servers.VersionInfo.MajorInterfaceVersion
* This allows the grid service to stop older, incompatible regions from connecting
2008-11-11 17:02:46 +00:00
Justin Clarke Casey f8c2efbe70 * Instead of putting 0.5.11.00000 if there is no revision, just put 0.5.11 instead
* This is to make things less confusing to users (and maybe a little easier to do future version filtering for grid connections)
* If there's disagreement about this, then please say so (preferably in the opensim-dev mailing list)
2008-10-29 19:57:30 +00:00
Justin Clarke Casey 7beeaf51f8 * minor: remove mono compiler warnings 2008-10-28 21:47:43 +00:00
Justin Clarke Casey 2a9796e2aa * Apply http://opensimulator.org/mantis/view.php?id=2482
* Stop 'show threads' throwing an exception if a thread is dead
2008-10-28 15:01:43 +00:00
Justin Clarke Casey 170cb935cd * refactor: make shutdown a template method in the same manner as startup, for consistency's sake 2008-10-03 16:06:00 +00:00
Justin Clarke Casey 0487c3158b * minor: restore the standard startup logo text now I understand why things were appearing in the wrong order 2008-10-03 15:44:44 +00:00
Justin Clarke Casey 3ffd77f70b * oops, fix region startup to be in the correct sequence (though it appeared to work anyway) 2008-10-03 15:41:27 +00:00
Justin Clarke Casey fbc813e658 * For shits and giggles, print out the time taken for a server to start up (which doesn't include stuff such as script starting time on the region server).
* Yes, you could work this out from timestamps in the logs, but that's far too much work
2008-10-03 15:23:35 +00:00
Justin Clarke Casey 70124a3213 * refactor: make startup a template method 2008-10-03 15:11:29 +00:00
Charles Krinke 339671afc6 Mantis#2017. Thank you kindly, Tyre, for a patch that solves:
Check the client dialog box (from top menu) WORLD / REGION ESTATE 
/ REGION tab. The client dialog box seems to have a hard limit of 
about 32 characters per line available for displaying the region 
version number. Our regions are sending a string which is greater 
than the limit, causing the client to wrap the text and look ugly.
2008-09-25 14:57:40 +00:00
Justin Clarke Casey 9170361bee * Complete refactoring accidentally left unfinished so that all server help requests flow through the ShowHelp() method 2008-09-15 17:45:48 +00:00
Homer Horwitz 8ae8bec4d1 Changed "show users" command to display only root agents, "show users full" to
display root and child agents (mantis #2171).
2008-09-12 22:39:17 +00:00
Jeff Ames 3bf8858727 Update svn properties, formatting cleanup. 2008-08-28 14:41:54 +00:00
Justin Clarke Casey c4d6a928c9 * Append thread information on to the end of period diagnostics information
* This is working towards finding out why many more client threads are hanging about on wright plaza than there are actual agents
2008-08-25 23:27:08 +00:00
Justin Clarke Casey 4a475ca2be * minor: refactor thread report into a method that returns a string rather than displays information directly 2008-08-25 23:21:07 +00:00
Jeff Ames bea7d4d81a Update svn properties, formatting cleanup. 2008-08-19 02:59:27 +00:00
Justin Clarke Casey 9650632cd1 * It appears that sometimes some IClientAPI reference is not being released, resulting in continual execution of the CheckConnectivity timer method
* For now, just turn off this timer when we close the connection
* Also some minor help refactoring creeps in to this revision.
2008-08-18 21:14:38 +00:00
Jeff Ames 6ef9d4da90 Formatting cleanup. 2008-08-18 00:39:10 +00:00
Justin Clarke Casey c602d76b79 * Insert a new 'set log level [level] command on the console'
* The primary immediate use is to provide a means of temporarily reducing log output on the console when executing console commands
* Changing the log level on the console is not permanent and does not affect the log information being put into OpenSim.log
* This could have been done by putting in a threshold level on the Console appeneder in OpenSim.exe.config and implementing config watching in the code.
* But I think that it's a little more user friendly to make this doable via the console.
2008-08-16 20:24:08 +00:00
Dahlia Trimble 230c80be54 Thanks, BlueWall, for a patch that:
Binary distributions of OpenSim are not able to get the version info because they lack the ../.svn/entries file. This file exists in the ./bin./svn directory, which would be in a binary distribution. The included patch changes the path from ../.svn/entries to .svn/entries, which allows the version information to be show in "help/about"
2008-08-14 10:23:00 +00:00
Justin Clarke Casey e32c0930c2 * Register main thread as console thread with thread tracker 2008-08-01 20:29:05 +00:00
Justin Clarke Casey 89898a2a6a * minor: get rid of count number from 'show threads' display since they all have IDs 2008-08-01 20:21:49 +00:00
Justin Clarke Casey a1d481d0f6 * minor: Make create user command appear on the region console only if the region is running standalone 2008-07-22 16:21:16 +00:00
Justin Clarke Casey f7d9b0bab7 * Move thread tracking code to base opensim server so that it's available for all servers (UGAIM as well as Region)
* This will work as long as those servers are actually registering any threads they use (does not include stuff plucked from the thread pool)
* command is now "show threads" rather than threads
2008-07-11 16:24:52 +00:00
Charles Krinke 1122f3f693 Mantis#1685. Thank you kindly, Mjm for a patch that:
The attached patch tries to read the SVN revision from local file 
"svn_revision" before checking "../.svn/entries".
This allows simulators not running from the source tree to properly 
display the SVN revision, if the installer generates the 
"svn_revision" file.
2008-07-08 01:11:52 +00:00
Jeff Ames a728417eda Minor formatting cleanup. 2008-06-18 03:50:39 +00:00
Justin Clarke Casey b799031010 * minor: Print out uptime as well as stats in periodic diagnostics logging, so it's easier to tell which isntances each print out of information is from 2008-06-13 16:58:24 +00:00
Jeff Ames 64f01ade04 Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers. 2008-06-13 00:21:53 +00:00
Justin Clarke Casey f07b761583 * Drop periodic stats logging back down to 60 minutes to reduce console spam.
* Please feel free to comment if the periodic logging is causing you problems in some way - I'm loathe to add yet another switch to OpenSim.ini but will if it proves necessary
2008-06-11 11:25:29 +00:00
Justin Clarke Casey ce9d0799ae * Add 'show info' command to all servers, which prints the directory in which the server was started
* This is potentially useful if you're using screen on a region console without knowing where it was originally started from
2008-06-11 00:41:07 +00:00
Justin Clarke Casey c2054d225e * minor: Reduce statistic log snapshots to every 20 minutes to get more information 2008-06-10 23:47:33 +00:00
Justin Clarke Casey 686f16cedd * If a server has statistics, print these out to the log every hour to get some idea of how these evolve
* When returning GC.GetTotalMemory(), force collection first in order to get more accurate figures
2008-06-10 23:19:38 +00:00
Jeff Ames 4ec4e16c80 Formatting cleanup, minor refactoring, svn properties. 2008-06-04 09:59:27 +00:00
Justin Clarke Casey 4453c8bc5c * experimental: Make OpenSim archiver save and reload all prim textures when not all faces have the same texture 2008-06-02 17:23:13 +00:00
Justin Clarke Casey a1395b90be * Add 'show version' help information into base OpenSim server 2008-06-02 16:28:04 +00:00
Justin Clarke Casey fbaeb081aa * Move most bookending startup/shutdown messages to BaseOpenSimServer so they appear in non-console servers too 2008-06-01 02:02:20 +00:00
Justin Clarke Casey 15d41c2fc2 * Fix build break by eliminating remaining IScenePermissions references - must remember to nant clean
* Hook all server startups into base opensim server startup method
2008-06-01 01:34:46 +00:00
Justin Clarke Casey 45fef8589d * Move log version printing up into BaseOpenSimServer 2008-06-01 01:22:19 +00:00
Justin Clarke Casey 8cb5ec5fdd * Make version information common to all servers
* Now all servers respond to the "show version" command on the console
2008-05-31 20:35:12 +00:00
Teravus Ovares febe78d062 * Implements UserServer logoff in a few situations
* User tries to log-in but is already logged in.  Userserver will send message to simulator user was in to log the user out there.
* From the UserServer, admin types 'logoff-user firstname lastname message'.
* Some regions may not get the message because they're not updated yet.
2008-05-31 12:18:29 +00:00