aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-282-59/+73
|\
| * 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() if...Justin Clark-Casey (justincc)2013-03-281-4/+7
| * Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region...Justin Clark-Casey (justincc)2013-03-281-1/+1
| * Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly...Justin Clark-Casey (justincc)2013-03-281-3/+12
| * On the North and East sides of a megaregion, only consider regions within 256...Justin Clark-Casey (justincc)2013-03-281-2/+2
| * 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
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-3/+7
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-262-2/+6
|\ \
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-242-2/+6
* | | Merge branch 'master' into careminsterMelanie2013-03-261-10/+109
|\ \ \ | | |/ | |/|
| * | Start recording inter-region teleport attempts, aborts, cancels and failures ...Justin Clark-Casey (justincc)2013-03-251-10/+109
* | | Merge branch 'master' into careminsterMelanie2013-03-231-0/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+4
* | 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-223-22/+35
|\ \ | |/
| * 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-201-15/+21
| * For those people collecting and comparing logfiles from servers scatteredRobert Adams2013-03-191-1/+1
* | Merge branch 'master' into careminsterMelanie2013-03-152-5/+31
|\ \ | |/
| * 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
* | 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-132-34/+168
|\ \ | |/
| * 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-081-0/+4
|\ \ | |/
| * Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-0/+5
* | Merge branch 'master' into careminsterMelanie2013-03-051-2/+0
|\ \ | |/
| * minor: Fix mono compiler warning in MonitorModuleJustin Clark-Casey (justincc)2013-03-051-2/+0
* | Merge branch 'avination' into careminsterMelanie2013-03-032-21/+26
|\ \
| * | 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
* | | Merge branch 'master' into careminsterMelanie2013-02-281-2/+4
|\ \ \ | | |/ | |/|
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-271-2/+4
| * | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-271-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-02-261-1/+47
|\ \ \ | |/ /
| * | 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-232-48/+73
|\ \ \ | |/ /
| * | 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