Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reinstate the timed region change signal | Melanie Thielker | 2014-03-25 | 1 | -0/+4 |
| | |||||
* | Harmonize the class name, ID and Name of the default perms module | Melanie Thielker | 2013-09-08 | 1 | -3/+3 |
| | |||||
* | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵ | teravus | 2013-08-24 | 1 | -0/+2 |
| | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. | ||||
* | Make attachment state load work again | Melanie | 2013-08-01 | 1 | -1/+1 |
| | |||||
* | Allow coalesced objects to be rezzed even if they extend past the sim bounds | Melanie | 2013-06-18 | 1 | -2/+6 |
| | |||||
* | Put the "script saved" and "notecard saved" messages back into the bottom | Melanie | 2013-06-11 | 1 | -2/+2 |
| | | | | right corner. | ||||
* | Make objects attached from the ground appear in inventory again. Fixes a number | Melanie | 2013-06-08 | 1 | -1/+1 |
| | | | | of interaction issues causing client crashes. | ||||
* | Allow Linden trees to preserve their type when taken into inventory and ↵ | Melanie | 2013-05-26 | 1 | -3/+12 |
| | | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects. | ||||
* | Reset "Show in search" on parcels cut off other parcels that are in search | Melanie | 2013-05-24 | 1 | -0/+2 |
| | |||||
* | Refactor to get closer to core | Melanie | 2013-05-11 | 1 | -2/+2 |
| | |||||
* | Remove dumb "Region found!" message from map search | Melanie | 2013-05-06 | 1 | -2/+2 |
| | |||||
* | Implement llSetContentType using the new OpenID auth support for authentication | Melanie | 2013-05-05 | 1 | -1/+50 |
| | |||||
* | Fix the long standing bug of items being delivered to lost and found or ↵ | Melanie | 2013-05-01 | 1 | -2/+3 |
| | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission. | ||||
* | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | Melanie | 2013-04-30 | 1 | -2/+8 |
|\ | | | | | | | into avination-current | ||||
| * | Fix bug where an agent that declined an inventory offer and subsequently ↵ | Justin Clark-Casey (justincc) | 2013-04-30 | 1 | -2/+8 |
| | | | | | | | | | | | | emptied their trash would make the item invalid in the giver's inventory This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy. | ||||
* | | Fix CAPS to work like they should - do not send caps to the viewer if ↵ | Melanie | 2013-04-30 | 1 | -1/+1 |
|/ | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case. | ||||
* | Make the kicked user's avie truly disappear when it's god-kicked. | Diva Canto | 2013-04-25 | 1 | -2/+1 |
| | |||||
* | Gods module cleanup | Melanie | 2013-04-25 | 1 | -10/+0 |
| | |||||
* | Allow callers to set the invoice parameter for GenericMessage | Melanie | 2013-04-22 | 1 | -2/+2 |
| | |||||
* | 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' 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 | 3 | -30/+90 |
|\ \ | |/ | | | | | | | | | | | 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 | 1 | -9/+64 |
| | | |||||
| * | Check viewer 2/3 attachment calls against avatar appearance attachment data ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 2 | -21/+21 |
| | | | | | | | | | | | | | | | | 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 | ||||
| * | Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for ↵ | Justin Clark-Casey (justincc) | 2013-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | 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 commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster | Melanie | 2013-03-29 | 2 | -21/+18 |
|\ \ | |/ | | | | | | | | | | | | | 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 | 2 | -21/+20 |
| | | | | | | | | | | | | 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 '4ad9b275302ee109937512963eab095ff542a0c7' into careminster | Melanie | 2013-03-29 | 1 | -4/+10 |
|\ \ | |/ | |||||
| * | If the viewer has already rezzed any attachments itself, then ignore the ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -4/+10 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster | Melanie | 2013-03-29 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Move the simulator-side RezAttachments call on login to SP.MakeRootAgent ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary. This is to simplify the code (no tricky 'wasChild' signalling required) and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers) and the viewer-side attaching the v3 viewers perform. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-03-28 | 4 | -61/+76 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | ||||
| * | Add back a log message when we attempt a megaregion auto-reteleport | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -0/+4 |
| | | |||||
| * | minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -4/+7 |
| | | | | | | | | if module was enabled. | ||||
| * | Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+1 |
| | | | | | | | | region is removed rather than base.AddRegion() | ||||
| * | Instead of going via GodLikeRequestTeleport, auto-teleport the agent ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 2 | -4/+13 |
| | | | | | | | | | | | | directly in a megaregion, in the same manner at the "teleport user" console command. This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening. | ||||
| * | On the North and East sides of a megaregion, only consider regions within ↵ | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | 256m to be neighbours rather than regions up to 512 distant. This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides. This reduces the number of child agents being logged into regions neighbouring a megaregion. |