Commit Graph

27 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
23d902be42 Remove the old asset cache and local services and the configurations for them 2009-05-18 23:18:04 +00:00
lbsa71
a189da844a * Moved the DefaultConfig settings into already-existing ConfigSettings 2009-04-17 15:09:37 +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
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
MW
7a2985b441 Changed it so only .ini file types are loaded from the (optional) config directory rather all files types in that folder. 2009-02-28 15:16:12 +00:00
MW
b83d5c7cdb Added support for reading ini files from a (optional) config folder. This allows the spliting up of opensim.ini into multiple ini files.
The ini files in this folder are loaded after the masterini file (if that is set) and before opensim.ini. 
The default folder it looks for and searches is "bin\config", but that can be set by using the command arg "-inidirectory=<path>" (path is local to bin\) when starting up opensim.exe.
2009-02-27 14:17:57 +00:00
Charles Krinke
8f55b9d735 Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
2009-02-22 20:52:55 +00:00
Justin Clarke Casey
af57937760 * Apply http://opensimulator.org/mantis/view.php?id=3068
* This enables parsing of xml files and files obtained via http for the -inimaster option as well as -inifile
* Thanks StrawberryFride!
2009-02-17 17:12:10 +00:00
Sean Dague
f4bec00057 From: Alan Webb <awebb@linux.vnet.ibm.com>
The change makes two principal implementation changes:

[1] It removes the hard coded set of possible asset server client
implementations, allowing any arbitrary implementation that has been
identified to the PluginLoader as an appropriate extension. The
extension point for asset server client extension
is /OpenSim/AssetServerClient. All of the old configuration rules have
been preserved, and any of the legacy configuration values will still
work as they did before, except the implementation is now loaded as a
plug-in, rather than as a hard-coded instantiation of a specific class.
The re-hashing of IAssetServer as an extension of IPlugin made upgrading
of the implementation classes a necessity.

Caveat: I have not been able to meaningfully test the crypto-grid
clients. I believe they should work correctly, but the refactoring
necessary to handle plug-in based initialization (vs constructor-based
initialisation) admits the possibility of a problem.

[2] The asset cache implementation, previously introduce as a hard-code
class instantiation is now implemented as an IPlugin. Once again the
previous (configurationless) behavior has been preserved. But now it is
possible for those interested in experimenting with cache technologies
to do so simply by introducing a new extension for the asset cache
extension point (/OpenSim/AssetCache).

I've tested all of the configuration settings, after applying the patch
to a newly extracted tree, and they seem to work OK.
2009-02-16 12:20:31 +00:00
lbsa71
801da4346a * optimized usings. 2009-02-12 09:53:12 +00:00
Justin Clarke Casey
a1da605706 * Introduce a new "default" option for asset_database in the [STORAGE] section
* This option makes OpenSim use the usual db based asset service in standalone, and the grid based one in grid mode
* The other options can (local, grid, etc) can still be used explicitly as before
* Also change OpenSim.ini.example and the surrounding explanative text
2009-02-04 18:56:12 +00:00
Melanie Thielker
b175e8f6cd Fixes Mantis #2945
Committing the above patch with changes. Thank you, Gerhard. Removed
unneccessary verbosity in case of no error, added more output for errors.
Added support for HTTP Uri fetching which I had added in my last commit.
Converted the Console.WriteLines to log4net.
2009-01-02 12:57:21 +00:00
Melanie Thielker
18ba10b51c Add the ability to read the ini file from a URI. If the -inifile option
is a http:// URI, it will be fetched and parsed as an XML config.
2009-01-02 05:52:01 +00:00
Justin Clarke Casey
266d0fbaae * Apply http://opensimulator.org/mantis/view.php?id=2927 with some changes
* This allows configuration of the assetset and library control file paths to be other than ./inventory/Libraries.xml and ./assets/AssetSets.xml
* This is controlled via the LibrariesXMLFile and AssetSetsXMLFile configuration settings in [StandAlone] in OpenSim.ini (in standalone)
and via the user and asset config xml files for grid mode
* Thanks to SirKimba for the patch
2008-12-29 16:56:48 +00:00
Teravus Ovares
1e723f185a * Add two more missing defaults that use GetBoolean without a default in standalone. (not sure if this will fix your issue daTwitch.. it's probably not even a bug) 2008-12-20 17:34:38 +00:00
Teravus Ovares
7af84d7e10 * Adds defaults for some GetBoolean config values that previously did not have them. 2008-12-20 01:58:01 +00:00
Sean Dague
624423deb1 apparently opensim only works if secure_inventory_server = true, who
knew?  Reverting that.
2008-12-12 00:57:48 +00:00
Sean Dague
616cf74e73 make a couple of other config default to make the example ini to give us
a better chance of working out of the box
2008-12-11 20:43:21 +00:00
Sean Dague
a02efe6dcc after much discussion, and overwhelming +1 on the -dev list, switch the
default script engine to XEngine.  This won't change anything if you
already specified the default in your OpenSim.ini.
2008-12-11 20:32:57 +00:00
Jeff Ames
bbb8d6fc51 Remove empty OSUUID.cs file. Add copyright headers. Minor formatting cleanup. 2008-11-08 14:28:43 +00:00
Jeff Ames
1c4d6544d5 Update svn properties. 2008-11-06 01:56:42 +00:00
MW
571b94f537 moved the initial loading/setting of the config settings to its own class, ConfigurationLoader. To make it easier to customise the loading of those settings and possible in the future move it to a plugin. 2008-11-05 20:14:52 +00:00