aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-06-1113-11/+149
|\
| * Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba...Melanie2012-06-083-5/+73
| * Fix a corner case where checking for region corssing may cross an avatar back ifMelanie2012-06-081-2/+7
| * Revert "Add a frame based watchdog function to keyframed motion"Melanie2012-06-081-20/+0
| * Merge branch 'ubitwork' into avinationMelanie2012-06-081-0/+20
| |\
| | * Add a frame based watchdog function to keyframed motionMelanie2012-06-081-0/+20
| * | Cut off collision sounds with avatar at 3.2. This makes most walkig collisionsMelanie2012-06-081-1/+1
| * | Further limit the amount of avatar collisions that will actually triggerMelanie2012-06-071-2/+4
| * | Typo fixMelanie2012-06-071-3/+5
| * | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-078-0/+63
* | | Merge branch 'master' into careminsterMelanie2012-06-097-149/+139
|\ \ \
| * | | Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and jso...Justin Clark-Casey (justincc)2012-06-081-0/+2
| * | | Stop sending a DisableSimulator packet in LLClientView.Close(), which is a du...Justin Clark-Casey (justincc)2012-06-081-4/+0
| * | | Instead of retrieving the known client again in LLUDPServer.RemoveClient(), c...Justin Clark-Casey (justincc)2012-06-081-21/+10
| * | | If logging a client out due to ack timeout, do this asynchronously rather tha...Justin Clark-Casey (justincc)2012-06-083-10/+23
| * | | Add regression test for client logout due to ack timeout.Justin Clark-Casey (justincc)2012-06-085-108/+105
| * | | Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet n...Justin Clark-Casey (justincc)2012-06-081-8/+1
| * | | Store already retrieve IClientAPI in IncomingPacket structure for later use r...Justin Clark-Casey (justincc)2012-06-082-15/+16
* | | | 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
|\ \ \ \ | |/ / /
| * | | 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-078-122/+112
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| * | | 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-079-75/+149
|\ \ \ | | |/ | |/|
| * | 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
| * | 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
generated by cgit v1.1 at 2024-10-20 23:32:28 +0000