| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 23 | -880/+1501 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | ||||
| | * | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. | Robert Adams | 2013-04-09 | 3 | -6/+18 |
| | | | |||||
| | * | BulletSim: some formatting changes. | Robert Adams | 2013-04-09 | 1 | -10/+17 |
| | | | |||||
| | * | Another algorithm for AngularVerticalAttraction. This one Takes into account ↵ | Vegaslon | 2013-04-09 | 1 | -0/+23 |
| | | | | | | | | | | | | | all rotations before it and makes the corrections more close to the time that sl does. Signed-off-by: Robert Adams <Robert.Adams@intel.com> | ||||
| | * | BulletSim: add Bullet HACD library invocation. Turned off by default as not | Robert Adams | 2013-04-09 | 3 | -94/+183 |
| | | | | | | | | | totally debugged. Updated DLLs and SOs with more debugged HACD library code. | ||||
| | * | BulletSim: fix problem where large sets of mega-regions weren't registering | Robert Adams | 2013-04-09 | 1 | -3/+3 |
| | | | | | | | | | all the terrain with the base region. | ||||
| | * | minor: fix mono compiler warning in ScriptsHttpRequests.cs | Justin Clark-Casey (justincc) | 2013-04-10 | 1 | -1/+0 |
| | | | |||||
| | * | minor: remove mono compiler warnings in InventoryAccessModule | Justin Clark-Casey (justincc) | 2013-04-10 | 1 | -3/+2 |
| | | | |||||
| | * | Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 ↵ | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -1/+1 |
| | | | | | | | | | 02:34:51 2013) | ||||
| | * | minor: Log an exception if we aren't able to delete a script state file ↵ | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -1/+6 |
| | | | | | | | | | | | | | rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information. | ||||
| | * | BulletSim: moving comments around. No functional change. | Robert Adams | 2013-04-08 | 3 | -10/+11 |
| | | | |||||
| | * | BulletSim: clean up actor code so routines use the same coding pattern. | Robert Adams | 2013-04-08 | 10 | -123/+137 |
| | | | | | | | | | Fix a few enabling problems. | ||||
| | * | BulletSim: complete movement of physical object action code out of the | Robert Adams | 2013-04-08 | 11 | -636/+1078 |
| | | | | | | | | | | | physical object and into actors for setForce, setTorque, hover, lock axis and avatar move. | ||||
| | * | Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵ | Justin Clark-Casey (justincc) | 2013-04-06 | 4 | -53/+76 |
| | | | | | | | | | | | | | | | | | | | megaregions. This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks! | ||||
| | * | When rezzing a coalesced object, check adjust position of all components. | Justin Clark-Casey (justincc) | 2013-04-06 | 1 | -20/+27 |
| | | | |||||
| | * | refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 1 | -10/+4 |
| | | | | | | | | | simply iterate through pending requests without unnecessary checks. | ||||
| | * | Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 3 | -32/+76 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster | Melanie | 2013-04-04 | 2 | -14/+3 |
| |\ \ | |/ | |||||
| | * | minor: Stop falsely logging that a teleport was being aborted on client ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -3/+1 |
| | | | | | | | | | logout even when no teleport was active. | ||||
| | * | Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -11/+2 |
| | | | | | | | | | values could be returned if the sit orientation was changed whilst the property was being fetched. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 1 | -5/+6 |
| |\ \ | |/ | |||||
| | * | Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -5/+6 |
| | | | | | | | | | than one that could change whilst the method is being executed. | ||||
| * | | 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 | 17 | -225/+539 |
| |\ \ | |/ | | | | | | | 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 | 3 | -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. | ||||
| | * | 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. | ||||
| | * | 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 | 30 | -396/+1023 |
| |\ \ | |||||
| | * \ | 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 | 4 | -65/+195 |
| | | | | |||||
| | | * | 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 | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |