aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'master' into careminsterMelanie2013-03-011-21/+33
|\ \ \ | | |/ | |/|
| * | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ...Diva Canto2013-03-011-21/+33
* | | Merge branch 'master' into careminsterMelanie2013-02-282-3/+6
|\ \ \ | |/ /
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-272-3/+6
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-273-47/+61
| |\ \
| * | | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-272-3/+3
* | | | Merge branch 'master' into careminsterMelanie2013-02-271-9/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-271-9/+16
* | | | Merge branch 'master' into careminsterMelanie2013-02-273-24/+32
|\ \ \ \ | |/ / /
| * | | Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-272-22/+24
| * | | Add regression test for llRequestUrl()Justin Clark-Casey (justincc)2013-02-261-16/+21
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-265-32/+73
|\ \ \ | |/ /
| * | Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-254-31/+26
| * | Add StatsManager registration for region specific stats as collectedRobert Adams2013-02-241-1/+47
* | | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-233-49/+74
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-221-42/+81
| |\ \
| | * | Make reset of EntityTransferStateMachine for an avatar transfer always happen...Justin Clark-Casey (justincc)2013-02-221-42/+81
| * | | Added new Util function for reading config vars that's more generic than the ...Diva Canto2013-02-222-4/+5
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-226-14/+26
|\ \ \ | |/ /