aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionLoader (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-052-2/+2
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-052-2/+2
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2012-11-152-0/+66
|\ \ | |/
| * A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-142-0/+66
| |
| * Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-1/+0
| | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-0/+1
| | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmergeMelanie2011-10-112-35/+62
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
| * Added a setting to [Startup] section of config that will allow the simulator ↵Kevin Houlihan & Michelle Argus2011-09-242-21/+51
| | | | | | | | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-271-4/+20
|\ \ | |/
| * minor: make it clearer in the log where we're loading region config files ↵Justin Clark-Casey (justincc)2011-03-251-2/+2
| | | | | | | | and not the regions themselves
| * in region web loader, print out url that config is being loaded from (this ↵Justin Clark-Casey (justincc)2011-03-251-2/+2
| | | | | | | | wasn't being done anywhere).
| * Log the xml/ini regions config files that opensim loads from, and the ↵Justin Clark-Casey (justincc)2011-03-251-4/+20
| | | | | | | | | | | | regions that it loaded from them This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
* | Replace the screenful of code i deleted.Melanie Thielker2010-07-171-0/+19
| |
* | Make webloading more robust by addign retriesMelanie Thielker2010-07-171-26/+22
|/
* * Typo in previous commit.Adam Frisby2009-09-061-1/+1
|
* * Debugging why region loading is occurring so slowly on a setup with 64 ↵Adam Frisby2009-09-061-0/+1
| | | | regions in a Regions.ini (took 38 minutes on my test box)
* From this version onwards, all new region files created automatically willMelanie Thielker2009-06-251-2/+2
| | | | | | | | | | be created as new style INI files. This doesn't yet affect create region, but it does affect first starts of OpenSim.exe Because master avatars are slated to be replaced by estate owners, this now allows regions to be created without any master avatar data.
* Allow the reading of ini files instead of xml files when reading regionMelanie Thielker2009-06-251-6/+23
| | | | | | definitions from the file system
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-012-2/+2
| | | | LICENSE.txt.
* Allow some values that are set in OpenSim.ini to be set from region configMelanie Thielker2009-01-022-7/+7
| | | | | | XML as well.
* Mantis #2133Melanie Thielker2008-09-061-3/+3
| | | | | | | Thank you, Xugu Madison and ChrisDown, for a patch that fixes linux filename extensions from .Xml back to .xml
* * This is the fabled LibOMV update with all of the libOMV types from JHurlimanTeravus Ovares2008-09-061-3/+3
| | | | | | | * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
* fix: PostInitialise() not being called on script engines (nasty one that)Dr Scofield2008-09-021-1/+1
| | | | | | cleanup: warnings, readability
* - fixes a bug in RemoteAdminPlugin where CreateRegion would not payDr Scofield2008-08-221-3/+3
| | | | | | | | | attention to regionload_regionsdir from OpenSim.ini - fixes a type on RegionLoaderFileSystem
* As per the suggestion on the mailing list, added support for a OpenSim.xml ↵MW2008-06-262-6/+6
| | | | | | | config file, instead of a ini file. INI files still work the same as they did before, just now if a ini file isn't found, it looks for a OpenSim.xml file (of course in xml format) and if found uses that. Includes a OpenSim.Example.xml for reference (the default settings saved as a xml file).
* From: Dr Scofield <hud@zurich.ibm.com>Sean Dague2008-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the attached patch set is centered around RemoteAdminPlugin and focuses mainly on making it more robust (i.e. more parameter checking and better error reporting) but also we've re-implemented the LoadTerrain stuff that got disabled during the terrain code reworking: * missing PostInitialize() calls on region modules that were loaded for regions created via RemoteAdmin's CreateRegion XmlRpc call * re-implements RemoteAdmin's LoadTerrain XmlRpc call (probably lost during the TerrainModule rework) * adds lots more parameter checking and error reporting to RemoteAdmin * adds a read-only property to RegionApplicationBase so that we can access the CommsManager * adds Exceptions to TerrainModule so that we get better error case feedback (and can report more meaningful errors in turn) * adds a CheckForTerrainUpdate() call to TerrainModule.LoadFromFile() to make terrain changes effective * adds TryGetCurrentScene(LLUUID) to SceneManager so that we can retrieve Scenes not only by name but also by LLUUID cheers, dr scofield
* * Optimised using statements and namespace references across entire project ↵Adam Frisby2008-04-212-6/+9
| | | | (this took a while to run).
* * Added a "regionload_regionsdir" option to OpenSim.ini which determines ↵Adam Frisby2008-04-111-0/+13
| | | | where Region.XML files are stored. If not set, it will default to the usual location.
* Formatting cleanup.Jeff Ames2008-03-182-54/+54
|
* Converted logging to use log4net.Jeff Ames2008-02-051-8/+9
| | | | | | Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done.
* * Mother of all commits:Adam Frisby2008-01-151-3/+3
| | | | | | | * Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
* *Added ability to skip any use of the console when configuring and assume ↵mingchen2008-01-042-3/+3
| | | | default value. This is useful when the server is running by itself and a new region request is added without sufficient information
* * Optimized usingslbsa712007-12-272-24/+21
| | | | | | | * shortened references * Removed redundant 'this' * Normalized EOF
* saved OpenSim source code from the giant rampaging unterminated copyright ↵Jeff Ames2007-12-102-2/+2
| | | | notice of doom
* added one more command to the console help.Jeff Ames2007-12-071-3/+1
|
* * Small touchup of console messagesAdam Frisby2007-11-041-5/+5
|
* Deleted Regionloader .csproj files. MW2007-11-042-224/+0
|
* normalized line endingsJeff Ames2007-11-042-170/+170
|
* *Moved region loading into its own interface IRegionLoadermingchen2007-11-034-0/+394
*Added ability to load regioninfo remotely from a webserver from a single file. See share/RegionLoading/HOWTO_REMOTE_REGION_LOADING.txt for more info and an example file.