aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-084-84/+75
|\
| * Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTelepo...Justin Clark-Casey (justincc)2012-06-084-82/+74
* | Merge branch 'master' into careminsterMelanie2012-06-084-17/+24
|\ \ | |/
| * Go back to calling IncomingCloseAgent() in the "kick user" command for consis...Justin Clark-Casey (justincc)2012-06-082-7/+1
| * Remove duplicate update of user count in Scene.IncomingCloseAgent()Justin Clark-Casey (justincc)2012-06-083-14/+27
* | Merge branch 'master' into careminsterMelanie2012-06-084-25/+25
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-0859-0/+355
| |\
| | * Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| * | Fix bug with "kick user" reducing agent counts by 2 instead of 1.Justin Clark-Casey (justincc)2012-06-083-22/+24
| |/
* | Merge branch 'avination' into careminsterMelanie2012-06-0767-122/+467
|\ \
| * | Implement playing of the real collision sounds, change scaling for avatarMelanie2012-06-071-133/+57
| * | Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-071-4/+29
| * | Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| * | Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| * | Typo correctionMelanie2012-06-071-1/+1
| * | Disable default collision sounds until they can be uploaded, but enable custo...Melanie2012-06-071-55/+56
| * | Set collision sound type so custom sound types are recognizedMelanie2012-06-071-0/+2
| * | Make the "delay restart" button delay restart for 1 hour rather than abortingMelanie2012-06-073-31/+61
| * | Make timed bans / timed passes work as expected. Prevent transmission of mediaMelanie2012-06-072-2/+34
| * | Prevent a null ref when getting the velocity of an avatar during login orMelanie2012-06-071-2/+3
* | | 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