| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 25 | -253/+557 |
| |\ | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2013-04-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | * In between the fog, a moment of clarity. This fixes mantis 6570 | teravus | 2013-04-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-04-04 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last ↵ | Justin Clark-Casey (justincc) | 2013-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | user login time rather than serializing the DateTime directly which generates a set of unexpected fields. lastlogin return is in unix timestamp format. | ||||
| | * | | Merge commit 'f281a994e8544d95961ef669a0fe14c0cba7f175' into careminster | Melanie | 2013-04-04 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | 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 | 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 | ||||
| * | | | | Allow callers to set the invoice parameter for GenericMessage | Melanie | 2013-04-22 | 6 | -12/+22 |
| | | | | | |||||
| * | | | | Add the set object owner floater template | Melanie | 2013-04-22 | 1 | -0/+8 |
| |/ / / | |||||
| * | | | 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 |
| | |\ \ | | |/ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |