Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |||||
| * | | create a new ode character also with the new information | UbitUmarov | 2012-12-07 | 1 | -0/+6 | |
| | | | ||||||
| * | | *TEST* Use new avatar size in ubitODE. | UbitUmarov | 2012-12-07 | 1 | -0/+6 | |
| | | | ||||||
| * | | avatar collision plane send to viewer is only relative to feet. change | UbitUmarov | 2012-12-05 | 1 | -4/+11 | |
| | | | | | | | | | | | | avatar collider, just rounding the boxes, etc | |||||
| * | | *TEST* diferent avatar collider | UbitUmarov | 2012-12-03 | 1 | -2/+13 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-18 | 1 | -5/+13 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| * | | BulletSim: experimentally remove unit displacement from prim border crossing ↵ | Robert Adams | 2012-12-16 | 1 | -2/+13 | |
| | | | | | | | | | | | | test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-12-16 | 5 | -41/+66 | |
|\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||||
| * | | minor: If the physics module tells us that an object has gone out of bounds, ↵ | Justin Clark-Casey (justincc) | 2012-12-15 | 1 | -2/+5 | |
| | | | | | | | | | | | | more helpfully log the name, id, position and region of that object. | |||||
| * | | minor: Add commented out log lines to ScenePresenceAnimator for future debug ↵ | Justin Clark-Casey (justincc) | 2012-12-14 | 1 | -1/+10 | |
| | | | | | | | | | | | | use (such as logging anim pack contents sent to clients) | |||||
| * | | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ↵ | Justin Clark-Casey (justincc) | 2012-12-14 | 2 | -2/+42 | |
| | | | | | | | | | | | | | | | | | | | | | causing subsequent issues if physics was re-enabled. Added regression tests Addresses http://opensimulator.org/mantis/view.php?id=6365 | |||||
| * | | Simplify sit code a bit by determining correct animation in HandleSit ↵ | Dan Lake | 2012-12-13 | 1 | -30/+6 | |
| | | | | | | | | | | | | instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence | |||||
| * | | Switched the order by which foreign inventory and foreign assets are brought ↵ | Diva Canto | 2012-12-09 | 1 | -6/+4 | |
| | | | | | | | | | | | | in, to avoid race conditions on the client. | |||||
| * | | UserManagementModule: search the local cache for names too. | Diva Canto | 2012-12-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | Inventory transfers: don't do async on asset transfers or now. |