ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-05 18:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 96 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

164 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
9e6ffe7798 Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency. 2012-02-24 05:15:47 +00:00
Melanie
985526b662 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
 2012-02-18 22:21:10 +00:00
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