aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-021-2/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: Remove unnecessary call to GetAttachments() in ↵Justin Clark-Casey (justincc)2013-04-021-2/+0
| | | | | | | | AttachmentsModule.UpdateUserInventoryWithAttachment()
| * Fix what appears to be a bug in HGUserManagementModule where it enables on ↵Justin Clark-Casey (justincc)2013-04-021-2/+1
| | | | | | | | the base.Name rather than its own Name.
* | Merge branch 'master' into careminsterMelanie2013-03-312-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-301-25/+27
| | | | | | | | actively writing, simply return null instead of first logging an exception.
| * refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to ↵Justin Clark-Casey (justincc)2013-03-301-9/+9
| | | | | | | | InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
* | Merge branch 'master' into careminsterMelanie2013-03-301-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-291-6/+6
| | | | | | | | into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
* | Merge branch 'master' into careminsterMelanie2013-03-293-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 Cozens2013-03-291-9/+64
| |
| * Check viewer 2/3 attachment calls against avatar appearance attachment data ↵Justin Clark-Casey (justincc)2013-03-292-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-291-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 careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Revert "Try eliminating the pause before auto-reteleporting for a megaregion ↵Justin Clark-Casey (justincc)2013-03-291-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 careminsterMelanie2013-03-291-0/+3
|\ \ | |/
| * Add Location (relative), Rotation (Relative) and Rotation (World) to "show ↵Justin Clark-Casey (justincc)2013-03-291-0/+3
| | | | | | | | part" and other related console commands
* | Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Try eliminating the pause before auto-reteleporting for a megaregion now ↵Justin Clark-Casey (justincc)2013-03-291-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 careminsterMelanie2013-03-292-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-282-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 careminsterMelanie2013-03-291-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-281-61/+109
| | | | | | | | | | | | logging to be switched on and off. Default is off.
* | Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminsterMelanie2013-03-291-5/+0
|\ \ | |/
| * minor: remove some mono compiler warnings from EntityTransferModuleJustin Clark-Casey (justincc)2013-03-281-5/+0
| |
* | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-291-4/+10
|\ \ | |/
| * If the viewer has already rezzed any attachments itself, then ignore the ↵Justin Clark-Casey (justincc)2013-03-281-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 careminsterMelanie2013-03-291-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-281-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 careminsterMelanie2013-03-284-61/+76
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
| * Add back a log message when we attempt a megaregion auto-reteleportJustin Clark-Casey (justincc)2013-03-281-0/+4
| |
| * minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() ↵Justin Clark-Casey (justincc)2013-03-281-4/+7
| | | | | | | | if module was enabled.
| * Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a ↵Justin Clark-Casey (justincc)2013-03-281-1/+1
| | | | | | | | region is removed rather than base.AddRegion()
| * Instead of going via GodLikeRequestTeleport, auto-teleport the agent ↵Justin Clark-Casey (justincc)2013-03-282-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-281-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.
| * Make HGLureModule track god like lures as well as normal lures, to see if ↵Justin Clark-Casey (justincc)2013-03-281-1/+2
| | | | | | | | this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active.
| * Remove some Console.WriteLines accidentally left in last commit cfb20f09Justin Clark-Casey (justincc)2013-03-281-2/+0
| |
| * refactor: combine the checks for megaregion view range into a single place.Justin Clark-Casey (justincc)2013-03-281-51/+51
| |
* | Merge branch 'master' into careminsterMelanie2013-03-281-1/+44
|\ \ | |/
| * Fix problem with megaregions where teleporting into a different region which ↵Justin Clark-Casey (justincc)2013-03-281-1/+44
| | | | | | | | | | | | | | | | | | | | already had a child agent would stop the eq working for the agent in the new region. This was because the calculation as to whether a new agent was needed in the receiving region did not take megaregions into account, unlike the original calculation when the user first teleported into the region. This meant that on teleport, entity transfer would create a new CAP but this would be ignored by the viewer and receiving region, meaning that the EQ could no longer be used. This would prevent subsequent teleport, amongst other things. Currently, regions up to 512m from a megaregion are considered neighbours.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-268-5/+15
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-03-268-4/+14
|\ \ | | | | | | | | | careminster
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-248-4/+14
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | Merge branch 'master' into careminsterMelanie2013-03-261-10/+109
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | Start recording inter-region teleport attempts, aborts, cancels and failures ↵Justin Clark-Casey (justincc)2013-03-251-10/+109
| | | | | | | | | | | | | | | | | | in statistics for monitoring/debugging purposes These are recorded as 'entitytransfer' stats as seen by the "show stats entitytransfer" console command.
* | | Merge branch 'master' into careminsterMelanie2013-03-231-0/+4
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+4
| | | | | | | | | | This is relevant to mega-regions where the borders are very different to a regular region. Also adds some method doc and other code comments.
| * Following on from 476a7d3e (which wasn't enough), make chat across regions ↵Justin Clark-Casey (justincc)2013-03-221-56/+31
| | | | | | | | | | | | on different simulators work. Also resolves an issue of multiple chatting if the originating simulators had more than one region and they were neighbours
* | Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | Make sharing errors not spew and let the cache retry the filesMelanie Thielker2013-03-231-1/+15
| | |
* | | Merge branch 'master' into careminsterMelanie2013-03-222-10/+67
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2024-12-27 18:14:26 +0000