ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-18 04:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,264 Commits 5 Branches 93 Tags
da170cde4684ea0f8ed90ea4ed0b30172ad9981d
Commit Graph

641 Commits

Author SHA1 Message Date
Melanie Thielker
8f8e20b39d Small update to make the command line work again 2009-05-21 23:07:26 +00:00
Melanie Thielker
e5f3337c3f Implement .ini file includes. Anything that begins with "Include-" will be 
treated as another ini source to load.
For example:
Include-Asset = AssetSetup.ini
will load AssetSetup.ini after all other ini files are done.
This works recursively, too
 2009-05-21 23:06:10 +00:00
Melanie Thielker
4065ebff15 Remove the pre-log4net, discrete output methods from the consoles 2009-05-20 13:50:33 +00:00
Dr Scofield
4c7da1421f refactoring instantiation of Location object: moving it out of the for 
loop as it really is a "constant"
 2009-05-20 13:37:25 +00:00
Justin Clarke Casey
cd90ea377e * minor: Tweak the command exception catcher of last resort to make a little more sense 2009-05-19 19:57:45 +00:00
Melanie Thielker
23d902be42 Remove the old asset cache and local services and the configurations for them 2009-05-18 23:18:04 +00:00
Justin Clarke Casey
1cc9d1fd8d * minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191 
* didn't realize that we were getting back plain old exceptions
 2009-05-18 18:44:55 +00:00
Justin Clarke Casey
29671fc103 * Resolve http://opensimulator.org/mantis/view.php?id=3191 
* Catch directory exception on load oar as well as file exception
 2009-05-18 18:22:15 +00:00
diva
5e4fc6e91e Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only. 
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems: 
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
 2009-05-15 05:00:25 +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
Charles Krinke
e08d0a7ba5 Thank you kindly, Patnad, for a patch that: 
This patch allow you to see region rating from 
the console. Type "show ratings" and it will 
show you the rating of all your regions.
 2009-05-12 03:35:07 +00:00
Melanie Thielker
c1e7352d75 Add the asset service connectors and sample config. READ WARNINGS!!! 2009-05-09 02:49:55 +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
Justin Clarke Casey
af73bcd363 * Actually change the default oar file name to region.oar instead of scene.oar, for clarity 2009-04-29 18:12:50 +00:00
Justin Clarke Casey
23aa85b75d * Make scene.oar the default oar target rather than scene.oar.tar.gz, in an attempt to reduce confusion 2009-04-29 18:03:31 +00:00
diva
d8313e314f Getting rid of -hypergrid=true on the command line. This config now goes inside OpenSim.ini in the Startup section. This makes the HG compatible with -background, and prepares the way for further work on HG-related config vars. Might help with mantis #3527. 2009-04-27 00:16:59 +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
Justin Clarke Casey
83c9a6a230 * Change profile check for add user to run through the cache service 2009-04-17 16:06:35 +00:00
lbsa71
a189da844a * Moved the DefaultConfig settings into already-existing ConfigSettings 2009-04-17 15:09:37 +00:00
Dr Scofield
96a22862d2 adding log statement on shutdown in background mode 2009-04-17 13:27:32 +00:00
lbsa71
bbe1e19696 * Some more work on refactoring configs; 
* Moved the constants out into a separate DefaultConfig
  * Pulled configMember up
  * Some minor CCC
 2009-04-17 05:52:46 +00:00
Dr Scofield
bd2ca2d9c1 - turn private m_gui into protected m_gui to allow manipulation in 
derived classes
- make OpenSimBackground inherit from OpenSim instead of OpenSimBase
  so that it will have a MainConsole instance and we can use console
  commands, setting m_gui to false
 2009-04-16 12:10:50 +00:00
Justin Clarke Casey
1894157dd3 * Explicitly start the asset server thread so that unit tests can run single rather than multi-threaded (which may be behind the occasional test freezes) 2009-04-14 17:15:09 +00:00
Justin Clarke Casey
ad2bd74057 * refactor: rename AssetCache.Initialize() to AssetCache.Reset() to avoid having Initialise() and Initialize() in the same class - very difficult to read. 2009-04-14 16:36:32 +00:00
Homer Horwitz
648452dd91 - Add new RegionModulesControllerPlugin to the application modules 
- Change several classes to use the new plugin for handling of region-modules
  (NOTE: No regionmodule is using this yet)
- Add necessary prebuild parts (don't forget to runprebuild)
Attention: Work in progress. This shouldn't break anything, but you never know...
 2009-04-05 17:08:11 +00:00
idb
4e8723ad3f Directory defaults for region xml files when creating a new region got changed/lost with svn 8550 when a check was added for the file name having .xml extension. The extension check has been moved slightly earlier and the original directory logic restored. 
Fixes Mantis #3386
 2009-04-05 10:31:18 +00:00
lbsa71
7f4bf5871d * Proactively fixed bug-potential concerning the fact that m_httpServer property was differently referred to between RegionApplicationBase and all other grid services. 2009-04-03 20:56:36 +00:00
Dr Scofield
fc1b1bc797 - adding -logconfig option to allow configuration of log4net from 
log4net config file other then bin/OpenSim.exe.config
- moving ArgvConfigSource initialization up to allow for configuration
  of XmlConfigurator.Configure()
 2009-04-03 12:47:56 +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
diva
f7eac63e01 Another bit of refactoring to try to make sense of OpenSim.Framework.Communications. Everything that looks like a service, with service handlers, moved to .Services -- i.e. LoginService and Response, and GridInfoService. The rest of the changes were to adapt to the new locations of those files. 2009-03-29 22:04:45 +00:00
Justin Clarke Casey
10d21afd9d * Apply http://opensimulator.org/mantis/view.php?id=3343 
* Removes long unused -useexecutepath switch
* Thanks coyled
 2009-03-26 17:43:05 +00:00
Justin Clarke Casey
e694e1a657 * minor: Adjust exception catching on load/save xml[2]/oar. 
* Allow non FileNotFoundExceptions to propogate rather than post a misleading error message
 2009-03-25 19:21:28 +00:00
Justin Clarke Casey
19595a2825 * minor: spit out creator name on save iar 
* not yet ready for use
 2009-03-25 19:14:36 +00:00
Dr Scofield
09d2c6fe5d adding presence.ControllingClient.Kick(msg) to the brew. 2009-03-25 18:48:30 +00:00
Dr Scofield
0419f29856 enhances the console command "kick user" with an optional alert 
message which will be dialog-ed to the user just before being kicked.
 2009-03-25 18:04:33 +00:00
Justin Clarke Casey
5e9682cef7 * Fix edit scale command - was looking for one too few arguments 2009-03-24 19:04:28 +00:00
Justin Clarke Casey
8f1844665b * Group OpenSim.Framework.Servers interfaces together 2009-03-19 19:21:17 +00:00
diva
a7d610ffcc Adds support for unlink-region command in hypergrid. 2009-03-18 16:37:26 +00:00
Justin Clarke Casey
acad0328b2 * Make all coded defaults match settings in OpenSim.ini.example 
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using
* OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
 2009-03-11 18:02:22 +00:00
Dahlia Trimble
669aa46bff update some ini defaults in code - all defaults from beginning of OpenSim.ini.example thru DefaultScriptEngine = "XEngine" 2009-03-11 09:31:02 +00:00
lbsa71
91a096dca6 * Cleanup and CCC (Code Convention Conformance) 2009-03-10 20:27:41 +00:00
Justin Clarke Casey
fc2c73d5c6 * minor: remove some mono compiler warnings 2009-03-06 21:00:15 +00:00
Justin Clarke Casey
f18400fcfb * For now, restore file extension for default oar name I accidentally removed on the last commit 2009-03-04 20:36:09 +00:00
Justin Clarke Casey
b52ac542ad * Add the abilty to load and save iar item nodes where folders have identical names 2009-03-04 20:31:03 +00:00
MW
76133d0763 Refactoring of CreateCommsManagerPlugin. 
Plus some general cleanup of a few other files (deleting excess blank lines etc)
 2009-03-03 12:51:54 +00:00
MW
8ebd5b409a Renamed OpenSimBase m_autoCreateLindenStack to m_autoCreateClientStack 2009-03-02 18:04:00 +00:00