aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-0710-75/+150
|\
| * Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-074-32/+26
| * Don't send kill object messages to clients when a child agent is closed.Justin Clark-Casey (justincc)2012-06-071-18/+21
| * Mantis 6044 Building master currently fails.Talun2012-06-071-0/+1
| * Make change to fix Windows buildsBlueWall2012-06-071-1/+1
| * Log warning if we try to remove a UDP client that has already been removed.Justin Clark-Casey (justincc)2012-06-071-0/+6
| * Allow the thread watchdog to accept an alarm method that is invoked if the ti...Justin Clark-Casey (justincc)2012-06-074-25/+96
* | Remove a null ref when an avatar's attachment gets the avatar velocityMelanie2012-06-061-4/+3
* | Remove useless logging of a bare-names stack trace. It's meaninglessMelanie2012-06-061-32/+57
* | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
* | Reverse the logic of a conditional. Clears up a merge artefact.Melanie2012-06-061-1/+1
* | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-061-4/+29
* | Merge branch 'avination' into careminsterMelanie2012-06-069-35/+87
|\ \
| * | fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| * | revert last bad commit but fix recoil directionUbitUmarov2012-06-051-4/+4
| * | Stop llRezAtRoot() from applying velocity setting impulse in World.RezObject...UbitUmarov2012-06-051-2/+3
| * | Fix land collisions to work like SL.Melanie2012-06-051-6/+16
| * | Actually trigger land collisions in the root even when a child collidesMelanie2012-06-041-1/+1
| * | Merge branch 'ubitwork' into avinationMelanie2012-06-041-3/+3
| |\ \
| | * | fix addforce/impulse.UbitUmarov2012-06-041-3/+3
| * | | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach posi...Melanie2012-06-045-9/+27
| |/ /
| * | When regions are set to shut down the instance, always send notifications toMelanie2012-06-031-6/+30
* | | Merge branch 'master' into careminsterMelanie2012-06-0617-441/+523
|\ \ \ | | |/ | |/|
| * | minor: Change log messages on Warp3DImageModule to show they are from this mo...Justin Clark-Casey (justincc)2012-06-061-7/+9
| * | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class name...Justin Clark-Casey (justincc)2012-06-061-0/+0
| * | Actively dispose of Bitmaps in Warp3D image module and world map module once ...Justin Clark-Casey (justincc)2012-06-063-215/+248
| * | enabling all corners of a sim to be set in one callSignpostMarv2012-06-061-1/+11
| * | Ensure closure of bitmap and memory stream with using() statements in WorldVi...Justin Clark-Casey (justincc)2012-06-061-7/+8
| * | Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen f...Justin Clark-Casey (justincc)2012-06-051-2/+0
| * | minor: Add user feedback when executing fix-phantomsJustin Clark-Casey (justincc)2012-06-051-0/+2
| * | Allow fix-phantoms command to appear even if CombineContiguousRegions = false...Justin Clark-Casey (justincc)2012-06-051-13/+11
| * | Mantis 4597 AgentPaused packet is ignored.Talun2012-06-052-3/+28
| * | Remove unused ScenePresence list structure in llGetAgentList()Justin Clark-Casey (justincc)2012-06-051-1/+0
| * | Scale down per frame MS stats to match scaled simulator FPS stat.Justin Clark-Casey (justincc)2012-06-051-1/+1
| * | Start sending spare frame time MS viewer stat. Make frame time correctly dis...Justin Clark-Casey (justincc)2012-06-052-78/+124
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-055-44/+50
| |\ \
| | * | Add replaceable region modules to the "show modules" commandBlueWall2012-06-041-29/+49
| | * | Remove profile from basic configurationMelanie2012-06-042-6/+0
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-06-041-1/+1
| | |\ \
| | | * | Correct the delegate specification in EventManager.TriggerTerrainTainted. Loo...Robert Adams2012-06-041-1/+1
| | * | | Remove the "Profile" config as it's covered by the replaceable interfaceMelanie2012-06-041-8/+0
| | |/ /
| * | | Properly show per frame millisecond statistics per frame, not as amount of ti...Justin Clark-Casey (justincc)2012-06-041-22/+41
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-06-034-78/+83
|\ \ \ | |/ /
| * | Fix build break whree accidentally did inv.Folders rather than inv.Folders.Co...Justin Clark-Casey (justincc)2012-06-021-1/+1
| * | minor: tidy up some commentsJustin Clark-Casey (justincc)2012-06-021-4/+2
| * | Fix various issues with http inventoryJustin Clark-Casey (justincc)2012-06-024-78/+85
* | | Merge branch 'avination' into careminsterMelanie2012-06-024-34/+63
|\ \ \ | | |/ | |/|
| * | Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-012-8/+34
| * | Fix impersonation, it got broken in a mergeMelanie2012-06-011-7/+10
| * | Remove the kill record. Core has removed it long ago and it really does more ...Melanie2012-06-011-19/+19