OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,234 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

23234 Commits (c6b0942f97d57bf4272e5224f4a452114cd1477b)

Author SHA1 Message Date
Melanie c6b0942f97 Merge branch 'master' into careminster 2013-04-05 00:03:33 +01:00
teravus d2367968e4 * In between the fog, a moment of clarity. This fixes mantis 6570 2013-04-04 19:10:23 -04:00
Melanie 6a5f6ac04e Merge branch 'master' into careminster 2013-04-04 03:17:57 +01:00
Melanie 967b523f49 Merge commit 'f281a994e8544d95961ef669a0fe14c0cba7f175' into careminster 2013-04-04 03:17:52 +01:00
Melanie b16a560b77 Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster 2013-04-04 03:17:38 +01:00
Justin Clark-Casey (justincc) f064075a85 Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last user login time rather than serializing the DateTime directly which generates a set of unexpected fields. 
lastlogin return is in unix timestamp format.
 2013-04-04 01:06:57 +01:00
Justin Clark-Casey (justincc) f281a994e8 refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more simply iterate through pending requests without unnecessary checks. 2013-04-04 00:49:07 +01:00
Justin Clark-Casey (justincc) 831e4c3850 Fix bug where outstanding llHTTPRequests for scripts were not being aborted when they were deleted. 
This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
 2013-04-04 00:36:15 +01:00
Justin Clark-Casey (justincc) 94d44142e3 minor: Stop falsely logging that a teleport was being aborted on client logout even when no teleport was active. 2013-04-03 00:48:36 +01:00
Justin Clark-Casey (justincc) 7bf1986e91 Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent values could be returned if the sit orientation was changed whilst the property was being fetched. 2013-04-03 00:24:33 +01:00
Justin Clark-Casey (justincc) 97f0c9da84 Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than one that could change whilst the method is being executed. 2013-04-03 00:23:20 +01:00
Justin Clark-Casey (justincc) c0319daa40 fix minor race condition in SOP.SitTargetPositionLL where inconsistency could occur if the sit target position changed whilst the property was fetched 2013-04-03 00:09:28 +01:00
Justin Clark-Casey (justincc) 3332af4060 minor: Make SOP.UpdateOffset() more consistent by checking against the same old OffsetPosition rather than one which may vary if it simultaneously changes. 2013-04-03 00:01:06 +01:00
Melanie 4bc5a7aa19 Merge branch 'master' into careminster 2013-04-02 23:53:23 +01:00
Justin Clark-Casey (justincc) a3c723ee30 Fix minor race condition where SOP.GetGeometricCenter() and 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.
 2013-04-02 23:48:55 +01:00
Melanie c10331c8c2 Merge branch 'master' into careminster 2013-04-02 23:48:01 +01:00
Melanie 41a652f6bd Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-04-02 23:47:19 +01:00
Robert Adams 68c8633ba1 BulletSim: create axis lock constraint with proper orientation and 
enable axis lock functionality.
 2013-04-02 06:40:12 -07:00
Robert Adams 17aef1c883 BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD 
mesh to hull conversion calls in place but code not working. Update
BulletSim DLLs and SOs for new API and HACD code.
 2013-04-01 18:03:11 -07:00
Robert Adams ebc1209fc9 BulletSim: rearrange mega-region terrain code to make the thread flow 
a little clearer.
 2013-04-01 18:03:09 -07:00
Justin Clark-Casey (justincc) 2bfe60e2fb Use Output instead of OutputFormat in appropriate places of XEngine status reporting. 2013-04-02 01:28:16 +01:00
Justin Clark-Casey (justincc) 69bc37acd6 minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.UpdateUserInventoryWithAttachment() 2013-04-02 01:00:55 +01:00
Justin Clark-Casey (justincc) 0dce496499 Fix what appears to be a bug in HGUserManagementModule where it enables on the base.Name rather than its own Name. 2013-04-02 00:55:00 +01:00
Justin Clark-Casey (justincc) 600087ab49 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-02 00:46:53 +01:00
Justin Clark-Casey (justincc) 4153cfbf14 Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is either not syntactical or unnecessary. 
May fix http://opensimulator.org/mantis/view.php?id=6593
 2013-04-02 00:45:29 +01:00
Robert Adams 84eb25da23 BulletSim: stop an avatar from moving if standing on a stationary 
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.
 2013-03-31 22:19:44 -07:00
Robert Adams 933ac60746 BulletSim: not quite functional axis lock code. 2013-03-31 22:19:43 -07:00
Robert Adams 7d50015a74 BulletSim: start the renaming of local variables to m_ form to match the OpenSim coding conventions. 2013-03-31 22:19:42 -07:00
Robert Adams 75b8cf428e BulletSim: fix line endings in BSActor* 2013-03-31 22:19:42 -07:00
Robert Adams 747ece59d2 BulletSim: convert BSDynamic to a BSActor and change BSPrim to set 
up the vehicle actor.
 2013-03-31 22:19:41 -07:00
Robert Adams 2c581cae2a BulletSim: Add physical 'actors' that operate on the physical object. 
Add first 'actor' for locked axis.
 2013-03-31 22:19:41 -07:00
Melanie 4bfc469584 Merge branch 'master' into careminster 2013-03-31 22:00:39 +01:00
Melanie 9b83e53b28 Export permission, part two. Setting export perms for textures and clothing 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!
 2013-03-31 21:59:44 +01:00
Melanie ae833af3a9 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-03-31 20:56:13 +01:00
Melanie f142e1f394 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-03-31 20:27:46 +02:00
Melanie 4bf9c4bbb8 Export permission, part two. Setting export perms for textures and clothing 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!
 2013-03-31 20:25:32 +02:00
Melanie 64a56059b1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-30 21:19:10 +00:00
Justin Clark-Casey (justincc) 9fee431cc8 In the flotasm asset cache, if we get a request for a file that we're actively writing, simply return null instead of first logging an exception. 2013-03-30 01:21:16 +00:00
Justin Clark-Casey (justincc) f8785b5f47 refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods 2013-03-30 00:29:52 +00:00
Justin Clark-Casey (justincc) 76629289f0 refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2 2013-03-29 23:59:21 +00:00
Kevin Cozens cbc9ae898c Added missing functionality (mainly custom headers) to llHTTPRequest. 2013-03-29 23:32:11 +00:00
Melanie d5d6a274a7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-29 23:28:47 +00:00
Justin Clark-Casey (justincc) 023faa227e Check viewer 2/3 attachment calls against avatar appearance attachment data 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
 2013-03-29 23:10:28 +00:00
Melanie f2f8248178 Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-29 02:42:47 +00:00
Justin Clark-Casey (justincc) 23ae4c0a4d Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for 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
 2013-03-29 02:21:38 +00:00
Melanie e9eb837347 Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster 2013-03-29 02:21:20 +00:00
Melanie 3696a668a8 Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster 2013-03-29 02:21:06 +00:00
Melanie 7d466d36a3 Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster 2013-03-29 02:20:47 +00:00
Melanie e7d76c91c2 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-03-29 02:19:12 +00:00
Melanie 05810e48b0 Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster 
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
 2013-03-29 02:15:47 +00:00