aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionLoader/Web (follow)
Commit message (Collapse)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-79/+52
|
* bad merge?UbitUmarov2015-09-011-44/+66
|\
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-211-1/+1
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * | | Convert region loading to new formatMelanie Thielker2014-04-261-2/+2
| |/ /
| * | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
| |\ \ \ \
| * \ \ \ \ Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmergeMelanie2011-10-111-34/+59
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
| * | | | | | 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
| | | | | | |
* | | | | | | Updated all occurrences of AssemblyVersion("0.8.1.*") to ↵Diva Canto2015-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AssemblyVersion("0.8.2.*")
* | | | | | | Change assembly versions to 0.8.1Justin Clark-Casey (justincc)2014-06-171-1/+1
| | | | | | |
* | | | | | | Remove the old XML format parsing. Now additional region params can just beMelanie2014-04-121-2/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | added as they are already exposed through an API when using Nini. That will remove the need to always edit RegioInfo just to add a region based setting.
* | | | | | Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| | | | | |
* | | | | | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-271-12/+29
| |_|_|_|/ |/| | | | | | | | | | | | | | places where we were not already.
* | | | | Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |_|_|/ |/| | |
* | | | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | 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.
* | | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-141-0/+33
| | |
* | | 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
* | Added a setting to [Startup] section of config that will allow the simulator ↵Kevin Houlihan & Michelle Argus2011-09-241-20/+48
| | | | | | | | | | | | 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.
* | 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).
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* Allow some values that are set in OpenSim.ini to be set from region configMelanie Thielker2009-01-021-5/+5
| | | | | | XML as well.
* As per the suggestion on the mailing list, added support for a OpenSim.xml ↵MW2008-06-261-3/+3
| | | | | | | 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).
* * Optimised using statements and namespace references across entire project ↵Adam Frisby2008-04-211-5/+7
| | | | (this took a while to run).
* Formatting cleanup.Jeff Ames2008-03-181-27/+27
|
* 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-041-1/+1
| | | | 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-271-18/+19
| | | | | | | * shortened references * Removed redundant 'this' * Normalized EOF
* saved OpenSim source code from the giant rampaging unterminated copyright ↵Jeff Ames2007-12-101-1/+1
| | | | notice of doom
* * Small touchup of console messagesAdam Frisby2007-11-041-5/+5
|
* Deleted Regionloader .csproj files. MW2007-11-041-112/+0
|
* normalized line endingsJeff Ames2007-11-041-98/+98
|
* *Moved region loading into its own interface IRegionLoadermingchen2007-11-032-0/+210
*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.