aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-1015-122/+609
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Change IsRoot to use ReferenceEquals to prevent operator == messinessMelanie2013-01-091-1/+1
| |
| * fix llGetRot and parameters prim_rotation for attachments. Only onUbitUmarov2013-01-091-1/+27
| | | | | | | | LSL_api to avoid side effects for now
| * stop endless loop in lGetLinkPrimitiveParamsUbitUmarov2013-01-091-0/+2
| |
| * Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the realMelanie2013-01-091-1/+1
| | | | | | | | issue.
| * Merge branch 'teravuswork' into avinationMelanie2013-01-091-2/+8
| |\
| | * * ubit pointed out another place where that check needed to be updated and I ↵teravus2013-01-011-6/+3
| | | | | | | | | | | | normalized it.
| | * * This is actually the fix described the last commit.. I had commented it ↵teravus2013-01-011-1/+1
| | | | | | | | | | | | out to see if the problem had affected all attachments or just HUD attachments.
| | * * Fixes the attachment scripted rotation bug. The problem is the code was ↵teravus2013-01-011-2/+11
| | | | | | | | | | | | relying on m_host.ParentId = 0 to determine if the attachment should be rotated against root prim offset. To fix it for attachments, we also need to check if the host's localID == RootPart's localID. otherwise we are cumulatively rotating against the host's root part rotation offset (which in this case, is it's own rotation)
| | * Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-013-16/+16
| | |\
| * | | Revert "Prevent empty Anim Packs"Melanie2013-01-091-12/+0
| | | | | | | | | | | | | | | | This reverts commit ab053df706055b0aa8fe2d10f89488be97d36841.
| * | | Revert "Fix sequence id fr default anim"Melanie2013-01-091-1/+1
| | | | | | | | | | | | | | | | This reverts commit 8f37f2ca7edd408f30165fef9817375a9813ce90.
| * | | Fix sequence id fr default animMelanie2013-01-081-1/+1
| | | |
| * | | Prevent empty Anim PacksMelanie2013-01-081-0/+12
| | | |
| * | | Add the new UpdateAgentInformation cap to make maturity on more recent viewersMelanie2013-01-081-0/+19
| | | | | | | | | | | | | | | | work.
| * | | Remove now superfluous update of m_lastSizeMelanie2013-01-081-3/+0
| | | |
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2013-01-088-34/+439
| |\ \ \
| | * | | also update m_lastSize in SendAvatarDataToAllAgents so more paths updateUbitUmarov2013-01-081-0/+2
| | | | | | | | | | | | | | | | | | | | it
| | * | | Revert "Remove sending AvatarData because this also happens on login, where ↵Melanie2013-01-081-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it chokes" This reverts commit d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.
| | * | | Merge branch 'teravuswork' into avinationMelanie2013-01-082-46/+111
| | |\ \ \ | | | |/ /
| | | * | * Fixed a bug that replayed old cached appearance when changing outfitsteravus2012-12-312-46/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added suser(bad client) DOS protection by limiting the max cacheitems to the maximum sane amount. * Prevents potential numerous loops from running amok and index errors if the client purposely provides bad cache info. * If the XBakes service wasn't running, the SetAvatarAppearance routine would crash when contacting the XBakes service even though it was in a Try/Catch for the appropriate error type. It only properly error handles with the type Exception :(. (commented on that because it's unusual)
| | * | | Merge branch 'ubitwork' into avinationMelanie2013-01-082-57/+90
| | |\ \ \
| | * | | | Remove sending AvatarData because this also happens on login, where it chokesMelanie2013-01-081-9/+1
| | | |_|/ | | |/| | | | | | | | | | | | Firestorm, Singularity and other viewers with the new appearance pipeline.
| | * | | Merge branch 'ubitwork' into avinationMelanie2013-01-073-16/+16
| | |\ \ \ | | | |_|/ | | |/| |
| | * | | * This finishes the implementation of AgentCachedTexture. Requires the ↵teravus2012-12-297-34/+372
| | | | | | | | | | | | | | | | | | | | XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
| * | | | Prevent avatar data from being sent during login when it's not valid andMelanie2013-01-082-2/+6
| | |_|/ | |/| | | | | | | | | | crashes login on some viewers.
| * | | put back position and rot change check before sending releasing plane constrainUbitUmarov2013-01-081-4/+7
| | | |
| * | | reduce sampling of camera raycasts to previus valueUbitUmarov2013-01-081-23/+26
| | | |
| * | | * DAnger, TEST * change camera plane collision detection. Still bounces onUbitUmarov2013-01-082-61/+88
| | |/ | |/| | | | | | | * prim edges due to camera lag
| * | also exclude landUbitUmarov2013-01-071-3/+3
| | |
| * | exclude avatars from unfiltered RaycastWorldUbitUmarov2013-01-071-3/+3
| | |
| * | in raycast for camera exclude self detectionUbitUmarov2013-01-071-3/+2
| | |
| * | don't try to read geom positions outside main ode thread :(UbitUmarov2013-01-061-10/+11
| |/
* | Merge branch 'avination' into careminsterMelanie2013-01-0620-456/+1120
|\ \ | |/
| * bug fix, cleanup...UbitUmarov2013-01-033-38/+34
| |
| * check land permitions on sit target for unscripted sitsUbitUmarov2013-01-033-0/+31
| |
| * make ResetMoveToTarget cancel any 'force' waiting to be applied to avatarUbitUmarov2013-01-031-7/+2
| | | | | | | | ( by the odd use of Velocity)
| * cancel MoveToTarget (viewer 'go here") on sitsUbitUmarov2013-01-031-2/+22
| |
| * i try to fix avatar orientation in some cases..UbitUmarov2013-01-021-2/+2
| |
| * add a lock to CollisionEventsThisFrameUbitUmarov2013-01-021-20/+29
| |
| * *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-026-332/+805
| |
| * Merge branch 'ubitwork' into avinationMelanie2012-12-225-60/+77
| |\
| | * Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-3/+3
| | |\
| | * \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-183-6/+8
| | |\ \
| | * | | missing fileUbitUmarov2012-12-181-4/+3
| | | | |
| | * | | fixUbitUmarov2012-12-183-8/+27
| | | | |
| | * | | some clean up/fixUbitUmarov2012-12-172-48/+47
| | | | |
| * | | | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-2112-34/+120
| | | | | | | | | | | | | | | | | | | | Cached Bakes.
| * | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵teravus2012-12-191-0/+20
| | | | | | | | | | | | | | | | | | | | synchronize with Agni.
| * | | | Merge branch 'avination' of careminster:/var/git/careminster into teravusworkteravus2012-12-1927-670/+1271
| |\ \ \ \