| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2013-01-10 | 3 | -59/+72 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Change IsRoot to use ReferenceEquals to prevent operator == messiness | Melanie | 2013-01-09 | 1 | -1/+1 |
| | | | |||||
| | * | Revert "Prevent empty Anim Packs" | Melanie | 2013-01-09 | 1 | -12/+0 |
| | | | | | | | | | This reverts commit ab053df706055b0aa8fe2d10f89488be97d36841. | ||||
| | * | Revert "Fix sequence id fr default anim" | Melanie | 2013-01-09 | 1 | -1/+1 |
| | | | | | | | | | This reverts commit 8f37f2ca7edd408f30165fef9817375a9813ce90. | ||||
| | * | Fix sequence id fr default anim | Melanie | 2013-01-08 | 1 | -1/+1 |
| | | | |||||
| | * | Prevent empty Anim Packs | Melanie | 2013-01-08 | 1 | -0/+12 |
| | | | |||||
| | * | Remove now superfluous update of m_lastSize | Melanie | 2013-01-08 | 1 | -3/+0 |
| | | | |||||
| | * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2013-01-08 | 1 | -0/+2 |
| | |\ | |||||
| | | * | 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 'ubitwork' into avination | Melanie | 2013-01-08 | 1 | -45/+61 |
| | | |\ | |||||
| | | * | | 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. | ||||
| | * | | | Prevent avatar data from being sent during login when it's not valid and | Melanie | 2013-01-08 | 2 | -2/+6 |
| | | |/ | |/| | | | | | | | crashes login on some viewers. | ||||
| | * | | put back position and rot change check before sending releasing plane constrain | UbitUmarov | 2013-01-08 | 1 | -4/+7 |
| | | | | |||||
| | * | | reduce sampling of camera raycasts to previus value | UbitUmarov | 2013-01-08 | 1 | -23/+26 |
| | | | | |||||
| | * | | * DAnger, TEST * change camera plane collision detection. Still bounces on | UbitUmarov | 2013-01-08 | 1 | -49/+59 |
| | |/ | | | | | | | * prim edges due to camera lag | ||||
| | * | in raycast for camera exclude self detection | UbitUmarov | 2013-01-07 | 1 | -3/+2 |
| | | | |||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-01-06 | 1 | -51/+111 |
| |\ \ | |/ | |||||
| | * | check land permitions on sit target for unscripted sits | UbitUmarov | 2013-01-03 | 1 | -0/+17 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | *TEST* avatar unscripted sit. Some guessing/automation | UbitUmarov | 2013-01-02 | 1 | -2/+4 |
| | | | |||||
| | * | Merge branch 'ubitwork' into avination | Melanie | 2012-12-22 | 1 | -47/+46 |
| | |\ | |||||
| | | * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-12-18 | 1 | -3/+3 |
| | | |\ | |||||
| | | * \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-12-18 | 1 | -4/+6 |
| | | |\ \ | |||||
| | | * | | | some clean up/fix | UbitUmarov | 2012-12-17 | 1 | -47/+46 |
| | | | | | | |||||
| | * | | | | * Partial Commit for Avatar Appearance to include the functionality of ↵ | teravus | 2012-12-21 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | | Cached Bakes. | ||||
| | * | | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵ | teravus | 2012-12-19 | 1 | -0/+20 |
| | | |_|/ | |/| | | | | | | | | | | synchronize with Agni. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 4 | -81/+74 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | | Fix llGetLinkKey() to return the last sat avatar as the last link number. | Justin Clark-Casey (justincc) | 2013-01-04 | 2 | -46/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/LlGetLinkKey This is done by keeping a scene-object wide list of sitters. This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim. This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists Addresses http://opensimulator.org/mantis/view.php?id=6477 | ||||
| | * | | | | Fixed several problems with the Sun: some settings didn't work, or were ↵ | Oren Hurvitz | 2013-01-02 | 2 | -35/+6 |
| | | | | | | | | | | | | | | | | | | | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky) | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-12-30 | 1 | -2/+2 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | ScenePresence passes the avatar rotation down to the physics engine. This ↵ | Robert Adams | 2012-12-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | will be a no-op for ODE but enables asymmetrical avatars for BulletSim. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-12-28 | 1 | -3/+8 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | Add check to always push terse updates for presences that have new ↵ | Robert Adams | 2012-12-27 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | velocities of zero. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-12-21 | 2 | -6/+15 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵ | Robert Adams | 2012-12-18 | 2 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags. | ||||
| * | | | | | Merge branch 'avination' into careminster | Melanie | 2012-12-18 | 2 | -184/+123 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Fix locking for good | Melanie | 2012-12-18 | 1 | -3/+3 |
| | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-12-17 | 1 | -174/+48 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | * TEST * unscripted sit | UbitUmarov | 2012-12-17 | 1 | -174/+48 |
| | | | | | |||||
| | * | | | 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. | ||||
| | * | | | Fix locking objects | Melanie | 2012-12-16 | 1 | -1/+3 |
| | |/ / | |||||
| | * | | right fix this time ?? | UbitUmarov | 2012-12-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix the 'fix' | UbitUmarov | 2012-12-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | fix coment out code not in use | UbitUmarov | 2012-12-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | FIX small avatars movement on terrain. (avatar appearance getting even | UbitUmarov | 2012-12-13 | 1 | -4/+36 |
| | | | | | | | | | | | | | more messy) | ||||
| | * | | add some default size setting and checks | UbitUmarov | 2012-12-07 | 1 | -1/+2 |
| | | | | |||||
| | * | | revert the use of avatar skeleton and use avatar size provided by viewers, | UbitUmarov | 2012-12-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | since at least for now seems good enought | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |