aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-043-16/+35
|\
| * Fix possible race condition with local region cache if a region was added aft...Justin Clark-Casey (justincc)2013-05-031-15/+28
| * Fix inventory issueBlueWall2013-05-011-0/+6
* | Merge branch 'master' into careminsterMelanie2013-05-012-3/+4
|\ \ | |/
| * Fix the long standing bug of items being delivered to lost and found or trash...Melanie2013-05-011-2/+3
| * Fix CAPS to work like they should - do not send caps to the viewer if they're...Melanie2013-04-301-1/+1
* | Merge branch 'master' into careminsterMelanie2013-04-302-86/+464
|\ \ | |/
| * 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 fold...Justin Clark-Casey (justincc)2013-04-291-0/+256
| * Add regression test for offer, accept and subsequent receiver delete of an it...Justin Clark-Casey (justincc)2013-04-291-80/+3
| * Fix bug where an agent that declined an inventory offer and subsequently empt...Justin Clark-Casey (justincc)2013-04-291-2/+8
* | 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 current...Diva Canto2013-04-241-1/+1
| * 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
| |\ \ | | |/
| | * 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 02...Justin Clark-Casey (justincc)2013-04-091-1/+1
| | * Fix taking (and rezzing) of coalesced objects in the non-root subregions of m...Justin Clark-Casey (justincc)2013-04-062-16/+18
| | * 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 simply...Justin Clark-Casey (justincc)2013-04-041-10/+4
| | * Fix bug where outstanding llHTTPRequests for scripts were not being aborted w...Justin Clark-Casey (justincc)2013-04-041-30/+62
* | | 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 logou...Justin Clark-Casey (justincc)2013-04-031-3/+1
| * | Merge branch 'master' into careminsterMelanie2013-04-021-2/+1
| |\ \ | | |/
| | * minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.Updat...Justin Clark-Casey (justincc)2013-04-021-2/+0
| | * Fix what appears to be a bug in HGUserManagementModule where it enables on th...Justin Clark-Casey (justincc)2013-04-021-2/+1
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
|/ /
* | Merge branch 'master' into careminsterMelanie2013-03-312-44/+34
|\ \ | |/
| * In the flotasm asset cache, if we get a request for a file that we're activel...Justin Clark-Casey (justincc)2013-03-301-25/+27
| * refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to Infor...Justin Clark-Casey (justincc)2013-03-301-9/+9
* | Merge branch 'master' into careminsterMelanie2013-03-301-6/+7
|\ \ | |/
| * refactor: move the append magic number processing for attachments back up int...Justin Clark-Casey (justincc)2013-03-291-6/+6
* | Merge branch 'master' into careminsterMelanie2013-03-293-30/+90
|\ \ | |/
| * 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 r...Justin Clark-Casey (justincc)2013-03-292-21/+21
| * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip...Justin Clark-Casey (justincc)2013-03-291-1/+1
* | 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
* | Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminsterMelanie2013-03-291-0/+3
|\ \ | |/
| * Add Location (relative), Rotation (Relative) and Rotation (World) to "show pa...Justin Clark-Casey (justincc)2013-03-291-0/+3
* | Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Try eliminating the pause before auto-reteleporting for a megaregion now that...Justin Clark-Casey (justincc)2013-03-291-1/+1
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-292-21/+18
|\ \ | |/