aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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-081-49/+59
| |/ / | | | | | | | | | * prim edges due to camera lag
| * | in raycast for camera exclude self detectionUbitUmarov2013-01-071-3/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-061-51/+111
|\ \ \ | |/ /
| * | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+17
| | |
| * | 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
| | |
| * | *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-021-2/+4
| | |
| * | Merge branch 'ubitwork' into avinationMelanie2012-12-221-47/+46
| |\ \
| | * \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-3/+3
| | |\ \
| | * \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-4/+6
| | |\ \ \
| | * | | | some clean up/fixUbitUmarov2012-12-171-47/+46
| | | | | |
| * | | | | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | Cached Bakes.
| * | | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵teravus2012-12-191-0/+20
| | |_|/ / | |/| | | | | | | | | | | | | synchronize with Agni.
* | | | | Merge branch 'master' into careminsterMelanie2013-01-044-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-042-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 Hurvitz2013-01-022-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 careminsterMelanie2012-12-301-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | ScenePresence passes the avatar rotation down to the physics engine. This ↵Robert Adams2012-12-281-0/+4
| | | | | | | | | | | | | | | | | | | | will be a no-op for ODE but enables asymmetrical avatars for BulletSim.
* | | | | Merge branch 'master' into careminsterMelanie2012-12-281-3/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | Add check to always push terse updates for presences that have new ↵Robert Adams2012-12-271-3/+8
| | | | | | | | | | | | | | | | | | | | velocities of zero.
* | | | | Merge branch 'master' into careminsterMelanie2012-12-212-6/+15
|\ \ \ \ \ | |/ / / /
| * | | | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵Robert Adams2012-12-182-6/+15
| | | | | | | | | | | | | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
* | | | | Merge branch 'avination' into careminsterMelanie2012-12-182-184/+123
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix locking for goodMelanie2012-12-181-3/+3
| | |_|/ | |/| |
| * | | Merge branch 'ubitwork' into avinationMelanie2012-12-171-174/+48
| |\ \ \ | | | |/ | | |/|
| | * | * TEST * unscripted sitUbitUmarov2012-12-171-174/+48
| | | |
| * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-12-171-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 ↵teravus2012-12-151-4/+4
| | |/ / | | | | | | | | | | | | root part to each of the child parts.
| * | | Fix locking objectsMelanie2012-12-161-1/+3
| |/ /
| * | right fix this time ??UbitUmarov2012-12-131-1/+1
| | |
| * | fix the 'fix'UbitUmarov2012-12-131-2/+2
| | |
| * | fix coment out code not in useUbitUmarov2012-12-131-2/+2
| | |
| * | FIX small avatars movement on terrain. (avatar appearance getting evenUbitUmarov2012-12-131-4/+36
| | | | | | | | | | | | more messy)
| * | add some default size setting and checksUbitUmarov2012-12-071-1/+2
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-2/+2
| | | | | | | | | | | | since at least for now seems good enought
| * | create a new ode character also with the new informationUbitUmarov2012-12-071-0/+6
| | |
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-0/+6
| | |
| * | avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-051-4/+11
| | | | | | | | | | | | avatar collider, just rounding the boxes, etc
| * | *TEST* diferent avatar colliderUbitUmarov2012-12-031-2/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-181-5/+13
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * | BulletSim: experimentally remove unit displacement from prim border crossing ↵Robert Adams2012-12-161-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 careminsterMelanie2012-12-165-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-151-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-141-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-142-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 Lake2012-12-131-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 Canto2012-12-091-6/+4
| | | | | | | | | | | | in, to avoid race conditions on the client.
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-1/+1
| | | | | | | | | | | | Inventory transfers: don't do async on asset transfers or now.