aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-144-8/+21
|\
| * Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p...Justin Clark-Casey (justincc)2012-06-143-7/+21
| * minor: remove unnecessary IsAttachment = false setting for new object in Uplo...Justin Clark-Casey (justincc)2012-06-141-1/+0
* | Merge branch 'master' into careminsterMelanie2012-06-148-24/+56
|\ \ | |/
| * minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplica...Justin Clark-Casey (justincc)2012-06-131-5/+7
| * Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-135-19/+0
| * Add ObjectUpdate as one of the packets that can be screened out when setting ...Justin Clark-Casey (justincc)2012-06-131-1/+2
| * In the osGetGrid functions, if the [GridInfo] section does not exist then ret...Justin Clark-Casey (justincc)2012-06-131-1/+6
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-131-100/+345
| |\
| | * Committing the Avination implementation of llCastRay. This is a complete rewriteMelanie2012-06-131-100/+345
| * | Add "deregister region" by uuid command to grid service to allow manual dereg...Justin Clark-Casey (justincc)2012-06-131-0/+45
| |/
* | Merge branch 'master' into careminsterMelanie2012-06-138-317/+175
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-131-1/+6
| |\
| | * Add variable timer configureation for the timer_ScriptBlueWall2012-06-121-1/+6
| * | Don't include time to transmit response back to requester when assessing slow...Justin Clark-Casey (justincc)2012-06-137-317/+169
| |/
* | Merge branch 'master' into careminsterMelanie2012-06-1210-98/+97
|\ \ | |/
| * Remove accidental timeout left in during earlier debugging. Has been in sinc...Justin Clark-Casey (justincc)2012-06-121-1/+1
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-126-70/+43
| * Set IClientAPI.IsActive = false early on client removal due to ack timeout ra...Justin Clark-Casey (justincc)2012-06-122-35/+38
| * If the simulator closes a root agent due to ack timeout, then send the client...Justin Clark-Casey (justincc)2012-06-121-2/+20
| * In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already a...Justin Clark-Casey (justincc)2012-06-124-24/+22
* | Merge branch 'master' into careminsterMelanie2012-06-112-6/+14
|\ \ | |/
| * Comment out the scene presence sitting debug log messages for nowJustin Clark-Casey (justincc)2012-06-111-6/+6
| * Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in L...Justin Clark-Casey (justincc)2012-06-111-3956/+3978
| * Add last frame time monitor to MonitorModule now that this value is usefulJustin Clark-Casey (justincc)2012-06-111-0/+8
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-113-0/+106
| |\
| | * Commitig the Avination implementation of llTeleportAgent andMelanie2012-06-113-0/+106
| * | Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where...Justin Clark-Casey (justincc)2012-06-091-3978/+3956
| |/
* | 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