aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-161-4/+8
|\
| * Allow coalesced objects to be rezzed even if they extend past the sim boundsMelanie2013-06-181-2/+6
| * Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
* | try to suspend and resume keyframes on copy to inventory to take copyUbitUmarov2013-06-061-1/+12
|/
* Allow Linden trees to preserve their type when taken into inventory and rezze...Melanie2013-05-261-3/+12
* Refactor to get closer to coreMelanie2013-05-111-2/+2
* 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-03-311-5/+5
|\
| * refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to Infor...Justin Clark-Casey (justincc)2013-03-301-9/+9
* | 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 '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 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminsterMelanie2013-03-291-5/+0
|\ \ | |/
| * minor: remove some mono compiler warnings from EntityTransferModuleJustin Clark-Casey (justincc)2013-03-281-5/+0
* | 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
generated by cgit v1.1 at 2024-11-13 03:41:03 +0000