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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	Merge branch 'master' into careminster	Melanie	2013-04-02	1	-1/+1
\|\ \ \| \|/
\| *	fix minor race condition in SOP.SitTargetPositionLL where inconsistency ↵	Justin Clark-Casey (justincc)	2013-04-03	1	-1/+1
\| \| \| \| \| \| \| \|	could occur if the sit target position changed whilst the property was fetched
* \|	Merge branch 'master' into careminster	Melanie	2013-04-02	22	-231/+545
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
\| *	minor: Make SOP.UpdateOffset() more consistent by checking against the same ↵	Justin Clark-Casey (justincc)	2013-04-03	1	-7/+7
\| \| \| \| \| \| \| \|	old OffsetPosition rather than one which may vary if it simultaneously changes.
\| *	Fix minor race condition where SOP.GetGeometricCenter() and ↵	Justin Clark-Casey (justincc)	2013-04-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running No need to create new Vector3s since these are structs.
\| *	BulletSim: create axis lock constraint with proper orientation and	Robert Adams	2013-04-02	1	-4/+2
\| \| \| \| \| \| \| \|	enable axis lock functionality.
\| *	BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD	Robert Adams	2013-04-01	7	-6/+20
\| \| \| \| \| \| \| \| \| \|	mesh to hull conversion calls in place but code not working. Update BulletSim DLLs and SOs for new API and HACD code.
\| *	BulletSim: rearrange mega-region terrain code to make the thread flow	Robert Adams	2013-04-01	1	-15/+18
\| \| \| \| \| \| \| \|	a little clearer.
\| *	Use Output instead of OutputFormat in appropriate places of XEngine status ↵	Justin Clark-Casey (justincc)	2013-04-02	1	-2/+2
\| \| \| \| \| \| \| \|	reporting.
\| *	minor: Remove unnecessary call to GetAttachments() in ↵	Justin Clark-Casey (justincc)	2013-04-02	1	-2/+0
\| \| \| \| \| \| \| \|	AttachmentsModule.UpdateUserInventoryWithAttachment()
\| *	Fix what appears to be a bug in HGUserManagementModule where it enables on ↵	Justin Clark-Casey (justincc)	2013-04-02	1	-2/+1
\| \| \| \| \| \| \| \|	the base.Name rather than its own Name.
\| *	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	Justin Clark-Casey (justincc)	2013-04-02	13	-203/+567
\| \|\
\| \| *	BulletSim: stop an avatar from moving if standing on a stationary	Robert Adams	2013-03-31	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	object. This will stop avatars from sliding down steep terrains or objects while still allowing an avatar to be moved if standing on a moving object.
\| \| *	BulletSim: not quite functional axis lock code.	Robert Adams	2013-03-31	5	-35/+43
\| \| \|
\| \| *	BulletSim: start the renaming of local variables to m_ form to match the ↵	Robert Adams	2013-03-31	1	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \|	OpenSim coding conventions.
\| \| *	BulletSim: fix line endings in BSActor*	Robert Adams	2013-03-31	2	-291/+302
\| \| \|
\| \| *	BulletSim: convert BSDynamic to a BSActor and change BSPrim to set	Robert Adams	2013-03-31	5	-112/+149
\| \| \| \| \| \| \| \| \| \| \| \|	up the vehicle actor.
\| \| *	BulletSim: Add physical 'actors' that operate on the physical object.	Robert Adams	2013-03-31	4	-74/+311
\| \| \| \| \| \| \| \| \| \| \| \|	Add first 'actor' for locked axis.
\| * \|	Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is ↵	Justin Clark-Casey (justincc)	2013-04-02	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	either not syntactical or unnecessary. May fix http://opensimulator.org/mantis/view.php?id=6593
* \| \|	Merge branch 'master' into careminster	Melanie	2013-03-31	0	-0/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Export permission, part two. Setting export perms for textures and clothing ↵	Melanie	2013-03-31	3	-10/+74
\| \|/ \| \| \| \| \| \| \| \| \| \|	works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
* \|	Merge branch 'master' into careminster	Melanie	2013-03-31	2	-44/+34
\|\ \ \| \|/ \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
\| *	In the flotasm asset cache, if we get a request for a file that we're ↵	Justin Clark-Casey (justincc)	2013-03-30	1	-25/+27
\| \| \| \| \| \| \| \|	actively writing, simply return null instead of first logging an exception.
\| *	refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to ↵	Justin Clark-Casey (justincc)	2013-03-30	1	-9/+9
\| \| \| \| \| \| \| \|	InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
* \|	Merge branch 'master' of ssh://3dhosting.de/var/git/careminster	Melanie	2013-03-31	31	-396/+1089
\|\ \
\| * \	Merge branch 'master' into careminster	Melanie	2013-03-30	1	-6/+7
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
\| \| *	refactor: move the append magic number processing for attachments back up ↵	Justin Clark-Casey (justincc)	2013-03-29	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
\| * \|	Merge branch 'master' into careminster	Melanie	2013-03-29	7	-85/+216
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
\| \| *	Added missing functionality (mainly custom headers) to llHTTPRequest.	Kevin Cozens	2013-03-29	5	-65/+196
\| \| \|
\| \| *	Check viewer 2/3 attachment calls against avatar appearance attachment data ↵	Justin Clark-Casey (justincc)	2013-03-29	3	-26/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rather than actually attached objects By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side. Initiating simulator-side is always necessary for version 1 viewers. This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
\| * \|	Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster	Melanie	2013-03-29	3	-1/+33
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
\| \| *	Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for ↵	Justin Clark-Casey (justincc)	2013-03-29	4	-2/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scripts in attachments. This was because the script resumption in AttachmentsModule was firing the attach event instead. Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal. This is to resolve http://opensimulator.org/mantis/view.php?id=6578
\| * \|	Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster	Melanie	2013-03-29	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Revert "Try eliminating the pause before auto-reteleporting for a megaregion ↵	Justin Clark-Casey (justincc)	2013-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	now that we're telepoting in a different way." Unfortunately fails on Nebadon's system right now. Needs investigation. May put in a temproary option for experimentation soon. This reverts commit d87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba.
\| * \|	Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster	Melanie	2013-03-29	1	-0/+3
\| \|\ \ \| \| \|/
\| \| *	Add Location (relative), Rotation (Relative) and Rotation (World) to "show ↵	Justin Clark-Casey (justincc)	2013-03-29	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	part" and other related console commands
\| * \|	Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster	Melanie	2013-03-29	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Try eliminating the pause before auto-reteleporting for a megaregion now ↵	Justin Clark-Casey (justincc)	2013-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that we're telepoting in a different way. On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up. Trying this change to see if this is true for other people.
\| * \|	Merge branch 'master' into careminster	Melanie	2013-03-29	1	-21/+0
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
\| \| *	Eliminate code which tries to restart attachment scripts in ↵	Justin Clark-Casey (justincc)	2013-03-29	1	-18/+0
\| \| \| \| \| \| \| \| \| \| \| \|	ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
\| * \|	Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster	Melanie	2013-03-29	4	-24/+23
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
\| \| *	Stop attempts to update/add existing attachments in user inventory when ↵	Justin Clark-Casey (justincc)	2013-03-28	4	-24/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	teleporting between regions. This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
\| * \|	Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster	Melanie	2013-03-29	1	-54/+145
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
\| \| *	Add "debug attachments" console command to allow highly verbose attachment ↵	Justin Clark-Casey (justincc)	2013-03-28	1	-61/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	logging to be switched on and off. Default is off.
\| * \|	Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster	Melanie	2013-03-29	1	-5/+0
\| \|\ \ \| \| \|/
\| \| *	minor: remove some mono compiler warnings from EntityTransferModule	Justin Clark-Casey (justincc)	2013-03-28	1	-5/+0
\| \| \|
\| * \|	Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster	Melanie	2013-03-29	1	-27/+27
\| \|\ \ \| \| \|/
\| \| *	minor: comment out unused Scene.AgentCrossing() to reduce code complexity	Justin Clark-Casey (justincc)	2013-03-28	1	-27/+27
\| \| \|
\| * \|	Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster	Melanie	2013-03-29	3	-11/+19
\| \|\ \ \| \| \|/
\| \| *	If the viewer has already rezzed any attachments itself, then ignore the ↵	Justin Clark-Casey (justincc)	2013-03-28	3	-11/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	simulator-side rez attachments call. This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.