aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-248-4/+14
* Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\
| * 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
|\ \
| * | Take out a testing sleep I accidentally left in the teleport code from last c...Justin Clark-Casey (justincc)2013-03-221-2/+0
| * | At strategic points in the teleport process, if the client has simultaneously...Justin Clark-Casey (justincc)2013-03-222-10/+69
* | | Merge branch 'master' into careminsterMelanie2013-03-227-29/+56
|\ \ \ | |/ /
| * | Implement chat across region borders since we can tell if avatars in neighbou...Justin Clark-Casey (justincc)2013-03-221-1/+1
| * | minor: On teleport, signal a child agent before we send the viewer TeleportFi...Justin Clark-Casey (justincc)2013-03-211-5/+5
| * | On a teleport, lock m_agentsInTransit whilst we grab the value to check for c...Justin Clark-Casey (justincc)2013-03-211-1/+8
| * | On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-202-17/+29
| * | Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-192-4/+12
| * | For those people collecting and comparing logfiles from servers scatteredRobert Adams2013-03-191-1/+1
| * | Process default attachment point in AttachObjectInternal before we check whet...Justin Clark-Casey (justincc)2013-03-191-27/+27
| * | Fix tests for multiattachMelanie2013-03-182-6/+6
| * | Merge branch 'master' into newmultiattachMelanie2013-03-1810-131/+655
| |\ \
| * \ \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \ \
| * | | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| * | | | Multiattach, part 1Melanie2013-03-182-33/+31
* | | | | Fix merge artefactsMelanie2013-03-192-6/+6
* | | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| * | | | Fix recent regression where an item worn to an attachment point that was alre...Justin Clark-Casey (justincc)2013-03-182-89/+153
* | | | | Merge branch 'master' into careminsterMelanie2013-03-153-5/+36
|\ \ \ \ \ | |/ / / /
| * | | | Add example code to DOExampleModule to pull data from that previously saved b...Justin Clark-Casey (justincc)2013-03-152-5/+29
| * | | | Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is ...Justin Clark-Casey (justincc)2013-03-151-0/+2
| * | | | Add ILandChannel.GetLandObject(Vector3 position) as this is a very common inp...Justin Clark-Casey (justincc)2013-03-141-0/+5
* | | | | Merge branch 'master' into careminsterMelanie2013-03-142-8/+133
|\ \ \ \ \ | |/ / / /
| * | | | Improve DAExampleModule to show current necessary locking to avoid race condi...Justin Clark-Casey (justincc)2013-03-131-8/+16
| * | | | Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+117
* | | | | Merge branch 'master' into careminsterMelanie2013-03-133-34/+173
|\ \ \ \ \ | |/ / / /
| * | | | minor: save some commented out log lines which will be useful again in future...Justin Clark-Casey (justincc)2013-03-131-0/+5
| * | | | Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section...Justin Clark-Casey (justincc)2013-03-121-1/+20
| * | | | Improve teleport cancellation in some circumstances, though cancelling telepo...Justin Clark-Casey (justincc)2013-03-122-34/+149
* | | | | Merge branch 'master' into careminsterMelanie2013-03-083-5/+10
|\ \ \ \ \ | |/ / / /
| * | | | minor: remove some completely unused string local vars added recently in comm...Justin Clark-Casey (justincc)2013-03-061-2/+0
| * | | | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-062-3/+11
* | | | | Merge branch 'avination' into careminsterMelanie2013-03-063-30/+40
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| * | | | Multiattach, part 1Melanie2013-03-052-30/+20
| * | | | Experimental - add void return support to modSendCommandMelanie2013-03-031-0/+2
* | | | | Merge branch 'master' into careminsterMelanie2013-03-052-146/+165
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | minor: Fix mono compiler warning in MonitorModuleJustin Clark-Casey (justincc)2013-03-051-2/+0
| | |_|/ | |/| |
| * | | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid r...Justin Clark-Casey (justincc)2013-03-051-140/+161
| | |/ | |/|
* | | Merge branch 'avination' into careminsterMelanie2013-03-034-26/+42
|\ \ \ | | |/ | |/|
| * | Reinstate uploading temporary texturesMelanie2013-02-271-4/+4
| * | Try to update inventory items when there is a valid asset - may fix temp text...Melanie2013-02-271-0/+5
| * | Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-15/+26
| * | Correctly remove https:// URLs from the http server.Melanie2013-02-171-1/+7