aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-217-67/+119
|\
| * Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instea...Justin Clark-Casey (justincc)2012-06-201-2/+3
| * refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ...Justin Clark-Casey (justincc)2012-06-201-2/+3
| * Log how many scripts are candidates for starting and how many are actually st...Justin Clark-Casey (justincc)2012-06-204-62/+106
| * If RegionReady is active, don't falsely say that logins are enabled in the ma...Justin Clark-Casey (justincc)2012-06-201-2/+2
| * minor: If logging because mesh/sculpt data isn't present for an object, log o...Justin Clark-Casey (justincc)2012-06-201-1/+1
* | Merge branch 'avination' into careminsterMelanie2012-06-152-2/+9
|\ \
| * | Revert changes...UbitUmarov2012-06-151-21/+3
| * | Add sop IsPhysical and IsPhantom to be used gradually in core in place of as...UbitUmarov2012-06-151-3/+21
| * | Changed t adding the avatar dependent sit offset and not subtracting, so not...UbitUmarov2012-06-131-2/+4
| * | *TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. Ch...UbitUmarov2012-06-131-1/+2
| * | Moved auxiliar funtions of last commit from sop to lsl api since they are on...UbitUmarov2012-06-121-34/+0
| * | *UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar ...UbitUmarov2012-06-121-0/+34
| * | change object drag so it applies a impulse and not a push force so it works a...UbitUmarov2012-06-111-2/+6
* | | Merge branch 'master' into careminsterMelanie2012-06-142-2/+19
|\ \ \ | | |/ | |/|
| * | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p...Justin Clark-Casey (justincc)2012-06-142-2/+19
* | | Merge branch 'master' into careminsterMelanie2012-06-122-5/+4
|\ \ \ | |/ /
| * | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-121-1/+1
| * | In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already a...Justin Clark-Casey (justincc)2012-06-121-4/+3
* | | Merge branch 'master' into careminsterMelanie2012-06-111-6/+6
|\ \ \ | |/ /
| * | Comment out the scene presence sitting debug log messages for nowJustin Clark-Casey (justincc)2012-06-111-6/+6
* | | Merge branch 'avination' into careminsterMelanie2012-06-114-4/+13
|\ \ \ | | |/ | |/|
| * | 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
| * | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-072-0/+3
* | | | Merge branch 'master' into careminsterMelanie2012-06-083-83/+75
|\ \ \ \ | | |_|/ | |/| |
| * | | Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTelepo...Justin Clark-Casey (justincc)2012-06-083-81/+74
* | | | Merge branch 'master' into careminsterMelanie2012-06-083-16/+23
|\ \ \ \ | |/ / /
| * | | Go back to calling IncomingCloseAgent() in the "kick user" command for consis...Justin Clark-Casey (justincc)2012-06-081-6/+0
| * | | Remove duplicate update of user count in Scene.IncomingCloseAgent()Justin Clark-Casey (justincc)2012-06-083-14/+27
* | | | Merge branch 'master' into careminsterMelanie2012-06-082-22/+22
|\ \ \ \ | |/ / /
| * | | Fix bug with "kick user" reducing agent counts by 2 instead of 1.Justin Clark-Casey (justincc)2012-06-082-20/+22
* | | | Merge branch 'avination' into careminsterMelanie2012-06-073-89/+16
|\ \ \ \ | | |/ / | |/| |
| * | | Implement playing of the real collision sounds, change scaling for avatarMelanie2012-06-071-133/+57
| * | | Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| * | | Disable default collision sounds until they can be uploaded, but enable custo...Melanie2012-06-071-55/+56
| * | | Make the "delay restart" button delay restart for 1 hour rather than abortingMelanie2012-06-071-0/+1
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-06-072-40/+38
|\ \ \ | | |/ | |/|
| * | Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-072-23/+18
| * | Don't send kill object messages to clients when a child agent is closed.Justin Clark-Casey (justincc)2012-06-071-18/+21
* | | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
* | | Merge branch 'avination' into careminsterMelanie2012-06-064-10/+19
|\ \ \ | | |/ | |/|
| * | fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| * | 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
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach posi...Melanie2012-06-042-2/+2