Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-08 | 5 | -28/+300 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | also update m_lastSize in SendAvatarDataToAllAgents so more paths update | UbitUmarov | 2013-01-08 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | it | |||||
| * | | | | Revert "Remove sending AvatarData because this also happens on login, where ↵ | Melanie | 2013-01-08 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it chokes" This reverts commit d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03. | |||||
| * | | | | Merge branch 'teravuswork' into avination | Melanie | 2013-01-08 | 2 | -46/+111 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | * Fixed a bug that replayed old cached appearance when changing outfits | teravus | 2012-12-31 | 2 | -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 avination | Melanie | 2013-01-08 | 2 | -57/+90 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | Remove sending AvatarData because this also happens on login, where it chokes | Melanie | 2013-01-08 | 1 | -9/+1 | |
| | |_|/ | |/| | | | | | | | | | | Firestorm, Singularity and other viewers with the new appearance pipeline. | |||||
| * | | | Merge branch 'ubitwork' into avination | Melanie | 2013-01-07 | 3 | -16/+16 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| * | | | * This finishes the implementation of AgentCachedTexture. Requires the ↵ | teravus | 2012-12-29 | 4 | -28/+233 | |
| | | | | | | | | | | | | | | | | 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. | |||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-08 | 1 | -4/+7 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | put back position and rot change check before sending releasing plane constrain | UbitUmarov | 2013-01-08 | 1 | -4/+7 | |
| | | | | ||||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-08 | 1 | -23/+26 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | reduce sampling of camera raycasts to previus value | UbitUmarov | 2013-01-08 | 1 | -23/+26 | |
| | | | | ||||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-08 | 2 | -61/+88 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | * DAnger, TEST * change camera plane collision detection. Still bounces on | UbitUmarov | 2013-01-08 | 2 | -61/+88 | |
| | |/ | |/| | | | | | | | * prim edges due to camera lag | |||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-07 | 1 | -3/+3 | |
|\ \ \ | |/ / | ||||||
| * | | also exclude land | UbitUmarov | 2013-01-07 | 1 | -3/+3 | |
| | | | ||||||
| * | | exclude avatars from unfiltered RaycastWorld | UbitUmarov | 2013-01-07 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-07 | 1 | -3/+2 | |
|\ \ \ | |/ / | ||||||
| * | | in raycast for camera exclude self detection | UbitUmarov | 2013-01-07 | 1 | -3/+2 | |
| | | | ||||||
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-06 | 1 | -10/+11 | |
|\ \ \ | |/ / | ||||||
| * | | don't try to read geom positions outside main ode thread :( | UbitUmarov | 2013-01-06 | 1 | -10/+11 | |
| |/ | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-03 | 3 | -38/+34 | |
|\ \ | |/ | ||||||
| * | bug fix, cleanup... | UbitUmarov | 2013-01-03 | 3 | -38/+34 | |
| | | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-03 | 2 | -0/+30 | |
|\ \ | |/ | ||||||
| * | check land permitions on sit target for unscripted sits | UbitUmarov | 2013-01-03 | 2 | -0/+30 | |
| | | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-03 | 1 | -3/+18 | |
|\ \ | |/ | ||||||
| * | make ResetMoveToTarget cancel any 'force' waiting to be applied to avatar | UbitUmarov | 2013-01-03 | 1 | -7/+2 | |
| | | | | | | | | ( by the odd use of Velocity) | |||||
| * | cancel MoveToTarget (viewer 'go here") on sits | UbitUmarov | 2013-01-03 | 1 | -2/+22 | |
| | | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-02 | 1 | -2/+2 | |
|\ \ | |/ | ||||||
| * | i try to fix avatar orientation in some cases.. | UbitUmarov | 2013-01-02 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-02 | 1 | -20/+29 | |
|\ \ | |/ | ||||||
| * | add a lock to CollisionEventsThisFrame | UbitUmarov | 2013-01-02 | 1 | -20/+29 | |
| | | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-02 | 6 | -332/+805 | |
|\ \ | |/ | ||||||
| * | *TEST* avatar unscripted sit. Some guessing/automation | UbitUmarov | 2013-01-02 | 6 | -332/+805 | |
| | | ||||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2013-01-02 | 8 | -42/+139 | |
|\ \ | |/ | ||||||
| * | Merge branch 'ubitwork' into avination | Melanie | 2012-12-22 | 5 | -60/+77 | |
| |\ | ||||||
| * | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 7 | -30/+71 | |
| | | | | | | | | | | | | Cached Bakes. | |||||
| * | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵ | teravus | 2012-12-19 | 1 | -0/+20 | |
| | | | | | | | | | | | | synchronize with Agni. | |||||
| * | | Merge branch 'avination' of careminster:/var/git/careminster into teravuswork | teravus | 2012-12-19 | 21 | -659/+1173 | |
| |\ \ | ||||||
| | * | | Add the interfaces for the new Avination baked texture cache service | Melanie | 2012-12-19 | 1 | -0/+19 | |
| | | | | ||||||
| * | | | * This is a better way to do the last commit. | teravus | 2012-12-08 | 1 | -30/+33 | |
| | | | | ||||||
| * | | | * Should promote faster self appearance. | teravus | 2012-12-07 | 1 | -19/+33 | |
| | | | | ||||||
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-12-18 | 3 | -3/+5 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-12-18 | 1 | -3/+3 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Fix locking for good | Melanie | 2012-12-18 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-12-18 | 3 | -6/+8 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-12-17 | 5 | -176/+250 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-12-17 | 1 | -3/+3 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avination Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | | * | | | * Fix for Prim Locking. Prior to the merge, it was just a clone of the ↵ | teravus | 2012-12-15 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | root part to each of the child parts. |