aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-043-16/+35
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Fix possible race condition with local region cache if a region was added ↵Justin Clark-Casey (justincc)2013-05-031-15/+28
| | | | | | | | after startup.
| * Fix inventory issueBlueWall2013-05-011-0/+6
| | | | | | | | Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
* | Merge branch 'master' into careminsterMelanie2013-05-012-3/+4
|\ \ | |/ | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * Fix the long standing bug of items being delivered to lost and found or ↵Melanie2013-05-011-2/+3
| | | | | | | | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission.
| * Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-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.
* | Merge branch 'master' into careminsterMelanie2013-04-302-86/+464
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-292-5/+198
| |
| * Add regression test for inventory item give, reject and subsequent trash ↵Justin Clark-Casey (justincc)2013-04-291-0/+256
| | | | | | | | | | | | folder purge by receiver. This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
| * Add regression test for offer, accept and subsequent receiver delete of an ↵Justin Clark-Casey (justincc)2013-04-291-80/+3
| | | | | | | | item offered via instant message.
| * Fix bug where an agent that declined an inventory offer and subsequently ↵Justin Clark-Casey (justincc)2013-04-291-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.
* | Merge branch 'master' into careminsterMelanie2013-04-251-2/+1
|\ \ | |/
| * Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-241-2/+1
| |
| * Commit Avination's God Kick feature.Melanie2013-04-251-62/+137
| |
| * Add Avination's support for parcel eject and freezeMelanie2013-04-251-0/+85
| |
* | Merge branch 'master' into careminsterMelanie2013-04-251-1/+1
|\ \ | |/
| * Bug fix: compare tolower. This should fix the issue where HG visitors ↵Diva Canto2013-04-241-1/+1
| | | | | | | | currently in the region were not being found by the avatar picker window.
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-223-27/+34
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-103-27/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| | * minor: fix mono compiler warning in ScriptsHttpRequests.csJustin Clark-Casey (justincc)2013-04-101-1/+0
| | |
| | * minor: remove mono compiler warnings in InventoryAccessModuleJustin Clark-Casey (justincc)2013-04-101-3/+2
| | |
| | * Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 ↵Justin Clark-Casey (justincc)2013-04-091-1/+1
| | | | | | | | | | | | 02:34:51 2013)
| | * Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵Justin Clark-Casey (justincc)2013-04-062-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-20/+27
| | |
| | * refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more ↵Justin Clark-Casey (justincc)2013-04-041-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-041-30/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-222-5/+2
|\ \ \ | |/ /
| * | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-041-3/+1
| |\ \ | | |/
| | * minor: Stop falsely logging that a teleport was being aborted on client ↵Justin Clark-Casey (justincc)2013-04-031-3/+1
| | | | | | | | | | | | logout even when no teleport was active.
| * | 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.
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
|/ /
* | 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
generated by cgit v1.1 at 2025-01-10 07:00:27 +0000