opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into careminster	Melanie	2013-08-01	1	-0/+2
\|\ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
\| *	Include missing reference that probably stops windows build from commit ↵	Justin Clark-Casey (justincc)	2013-08-01	1	-0/+1
\| \| \| \| \| \| \| \|	12995924052a1804f01dceb80803447fccc1d9fe
\| *	Experimental comment to eneralize the handling of Linden caps when the	Mic Bowman	2013-07-31	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
* \|	Merge branch 'master' into careminster	Melanie	2013-07-18	1	-0/+29
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
\| *	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2013-07-11	1	-0/+27
\| \|\
\| \| *	Added a test for the asset service	Diva Canto	2013-07-11	1	-0/+27
\| \| \|
\| * \|	Fix regression where llHTTPRequests which did not get an OK response ↵	Justin Clark-Casey (justincc)	2013-07-11	1	-0/+1
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	returned 499 and the exception message in the http_response event rather than the actual response code and body. This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013) This commit also adds a regression test for this case, though this currently only works with Mono This aims to address http://opensimulator.org/mantis/view.php?id=6704
\| *	Fix windows build break fromrecent dd1f95 for real this time - put new dll ↵	justincc	2013-07-06	1	-1/+1
\| \| \| \| \| \| \| \|	reference in the wrong place
\| *	Fix build break from recent commit dd15f95 on windows	Justin Clark-Casey (justincc)	2013-07-06	1	-0/+1
\| \|
* \|	Merge branch 'master' into careminster	Melanie	2013-07-04	1	-0/+1
\|\ \ \| \|/
\| *	Add --default option to "debug lludp packet" command to allow packet logging ↵	Justin Clark-Casey (justincc)	2013-07-04	1	-0/+1
\| \| \| \| \| \| \| \|	to be performed immediately from client start
* \|	Merge branch 'master' into careminster	Melanie	2013-06-23	1	-0/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
\| *	Make number of inbound http requests handled available as a ↵	Justin Clark-Casey (justincc)	2013-06-18	1	-0/+1
\| \| \| \| \| \| \| \|	httpserver.<port>.IncomingHTTPRequestsProcessed stat
\| *	Make general server stats available on the robust console as well as the ↵	Justin Clark-Casey (justincc)	2013-06-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	simulator console This means the "show stats" command is now active on the robust console.
\| *	Adding Avination's PollService to round out the HTTP inventory changes	Melanie	2013-06-07	1	-0/+1
\| \|
\| *	Port Avination's inventory send throttling	Melanie	2013-06-05	1	-0/+1
\| \|
* \|	Merge branch 'avination-current' into careminster	Melanie	2013-06-06	1	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
\| * \	Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵	Melanie	2013-04-28	1	-124/+210
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into avination-current Conflicts: bin/Regions/Regions.ini.example
\| * \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2013-01-26	1	-0/+1
\| \|\ \ \
\| * \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-12-03	1	-136/+273
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-09-24	1	-1/+0
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-09-24	1	-0/+1
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-09-24	1	-0/+1
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-09-17	1	-2/+2
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-09-17	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-09-11	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork	ubit	2012-09-11	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	dummy commit	ubit	2012-09-11	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	try fixing building..	ubit	2012-08-16	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-06-04	1	-0/+38
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
\| * \| \| \| \| \| \| \| \| \| \| \|	UserProfiles	BlueWall	2013-05-30	1	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-05-30	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
\| * \| \| \| \| \| \| \| \| \| \| \|	Add HG regression TestCachedUserNameForNewAgent()	Justin Clark-Casey (justincc)	2013-05-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-05-24	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \| \| \| \| \| \| \| \| \| \| \|	BulletSim: specify directory for OpenSim.Region.Physics.Meshing	Robert Adams	2013-05-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DLL file in prebuild.xml since that file ends up in bin/Physics directory.
\| * \| \| \| \| \| \| \| \| \| \| \|	BulletSim: add code to experimentally use asset hull data.	Robert Adams	2013-05-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default to 'off' as it needs debugging.
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "BulletSim: add code to experimentally use asset hull data."	Robert Adams	2013-05-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e. Remove this code until I can figure out why the references that are clearly in prebuild.xml doesn't work for the 'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
\| * \| \| \| \| \| \| \| \| \| \| \|	BulletSim: add code to experimentally use asset hull data.	Robert Adams	2013-05-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default to 'off' as it needs debugging.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-04-30	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
\| * \| \| \| \| \| \| \| \| \| \| \|	Add regression test for offer, accept and subsequent receiver delete of an ↵	Justin Clark-Casey (justincc)	2013-04-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	item offered via instant message.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-04-21	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
\| * \| \| \| \| \| \| \| \| \| \|	Small fix to prebuild xml for building with mono tools	BlueWall	2013-04-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Initial experimental support for materials-capable viewers. This is in a ↵	dahlia	2013-04-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet.
\| * \| \| \| \| \| \| \| \| \| \|	Added missing functionality (mainly custom headers) to llHTTPRequest.	Kevin Cozens	2013-03-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster	Melanie	2013-03-19	1	-115/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Finally remove the 'REST' ApplicationPlugins code which has been ↵	Justin Clark-Casey (justincc)	2013-03-15	1	-115/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	non-functional and largely commented out for many years.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-03-15	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| * \| \| \| \| \| \| \| \| \| \|	Make it possible to chain another asset service underneath the ↵	Justin Clark-Casey (justincc)	2013-03-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	de-duplicating XAssetService. This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand. Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService") Not yet ready for use.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into careminster	Melanie	2013-03-08	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
\| * \| \| \| \| \| \| \| \| \| \|	Add code for testing event queue messages recevied on region cross.	Justin Clark-Casey (justincc)	2013-03-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.