Commit Graph

664 Commits

Author SHA1 Message Date
Teravus Ovares (Dan Olivares)
b47e405420 * minor: Comments 2009-08-12 22:54:57 -04:00
Diva Canto
5d2a157e64 First pass at cleaning up old OGS1 and Local Inventory: removed everything-inventory in CommsManager, which wasn't actively used anymore. 2009-08-10 10:48:21 -07:00
Diva Canto
0d8284c7a1 Removed IAssetCache.
WARNING: PLEASE MAKE SURE TO USE THIS NEW bin/OpenSim.addin.xml
2009-08-10 08:14:57 -07:00
Melanie
257ed4c4ac Remove debugging output frm ini file loading. Make it collect matching
files only from last path component.
2009-08-07 23:05:16 +01:00
Melanie
a1a09297bc Silly error, simple fix 2009-08-07 22:40:58 +01:00
Melanie
e1427b4c3f Try another way to canonicalize the path that may work in Windoze 2009-08-07 22:37:41 +01:00
Melanie
d10f157183 Remove GetFullPath call from config includes, because it barfs in Windoze 2009-08-07 20:51:07 +01:00
Melanie
2148f84e1e Temporailiy add some info output in config load 2009-08-07 20:18:04 +01:00
Melanie
cb10700a1f Make the opensim.ini logfile option really work (port of a fix from ROBUST) 2009-08-07 14:15:59 +01:00
Melanie
efc57bc3d7 Allow arbitrary wildcards in config includes. Things like
Include-Modules = "addin-modules/*/config/*.ini" will now work.
Adds Util.Glob, which will resolve a globbed path into a string list.
2009-08-06 02:29:12 +01:00
Melanie Thielker
cabda86615 Patch from Kai Ludwig: Fix prim drawing on maptile. 2009-07-29 16:32:56 +00:00
lbsa71
169a353cca * minor ccc 2009-07-24 06:59:27 +00:00
MW
78d7f4696e Now we are past revision 10000, I think its time to start to fix that massive bug that was introduced in revision 1. So here is the first part of that fix. 2009-07-10 11:03:38 +00:00
Melanie Thielker
c310fb11f4 Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
2009-07-10 02:22:26 +00:00
Charles Krinke
525ab2c278 Thank you kindly, RandomHuman for a patch that:
The admin_close_region method removes a region from the simulator without deleting it. 
The region can then be recreated by calling admin_create_region with the same UUID. 
There is also a change to admin_create_region to facilitate this.The reason I want 
to have this functionality is to make it possible to detach regions when they are 
idle and recreate them on demand through a web interface. It's probably doable 
using the existing methods by saving and loading oars, but it also doesn't seem 
like that should be necessary.
2009-07-08 20:53:22 +00:00
Melanie Thielker
5869598c4c Make delete-region delete the section from an ini file. Will delete the whole
file if it has no sections left.
2009-06-26 00:00:20 +00:00
Melanie Thielker
7cc69ac97f Make create region save the new region to ini file format if the name
specifies an ini file.
If the ini file exists, the region will be added.
2009-06-25 23:31:55 +00:00
Jeff Ames
a23d64dec1 Formatting cleanup. 2009-06-10 04:28:56 +00:00
Justin Clarke Casey
bfea077508 * Add oar saving timeout
* If an oar save fails to get responses to all asset requests to the asset service then timeout after 60 seconds
* Timeout executes abort, since missing assets in an OAR seems bad
* This means that oar saves won't permanently hang and instead can be retried if something goes wrong with the asset service
* This is not a solution to mantis 3714.  Hopefully a fix will be along shortly since I can now consistently reproduce that problem
2009-06-05 13:48:43 +00:00
Charles Krinke
23bf1bf6e0 Thank you kindly, MattSetzer, for a patch that solves a Mantis:
This appears to be due to the fact that no asset cache has been 
configured, possibly as a result of the configuration changes that 
have been made recently. I've attached a patch to display a message 
to that effect rather than throwing an error.
2009-06-02 21:13:29 +00:00
Jeff Ames
c6f616049c Only save crashes to disk if save_crashes in OpenSim.ini is true (false by default). 2009-06-01 18:45:36 +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
diva
c061b4cb49 Changed the order of things in Scene creation. This piece of code is very jibbery, widely different results with slightly different orders. This particular order produces the best results in the UC Irvine sim in osgrid. But clearly there's something messed up here.
Addresses mantis #3707, mantis #3713, mantis #3686.
2009-05-26 16:45:30 +00:00
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