opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'avination' into careminster	Melanie	2012-10-07	1	-16/+21
\|\ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
\| *	Fix threading in remote asset connector	Melanie	2012-10-05	1	-16/+21
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2012-10-07	1	-2/+8
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
\| *	Make the asset retrieval concurrency a config switch. The current value	Mic Bowman	2012-10-04	1	-3/+8
\| \| \| \| \| \| \| \| \| \|	of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior.
\| *	Allow setting max connections for an endpoint	Melanie	2012-09-30	1	-3/+3
\| \|
* \|	Sequence/throttle asset retrievals.	Melanie	2012-09-14	1	-37/+67
\| \|
* \|	Allow setting max connections for an endpoint	Melanie	2012-09-14	1	-2/+2
\| \|
* \|	Prevent double slashes, try #4	UbitUmarov	2012-09-06	1	-1/+1
\| \|
* \|	Prevent double slashes, try #3	Melanie	2012-09-06	1	-0/+3
\| \|
* \|	Revert "Change string concatenation to Path.Combine to eliminate extra slashes."	Melanie	2012-09-06	1	-8/+6
\| \| \| \| \| \| \| \|	This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9.
* \|	Change string concatenation to Path.Combine to eliminate extra slashes.	Melanie	2012-09-06	1	-6/+8
\| \| \| \| \| \| \| \|	Windoze barfs on them.
* \|	Revert " remove extra '/' in assets url"	Melanie	2012-09-06	1	-13/+6
\| \| \| \| \| \| \| \|	This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486.
* \|	remove extra '/' in assets url	UbitUmarov	2012-09-06	1	-6/+13
\| \|
* \|	Merge branch 'avination' into careminster	Melanie	2012-07-16	1	-5/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
* \|	Merge branch 'master' into careminster	Melanie	2012-05-10	1	-31/+165
\|/
*	Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵	Justin Clark-Casey (justincc)	2012-05-09	1	-0/+329
	the actual class names. This is usually because the file name was singular (Service) but the class name was plural (Services). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes.