aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork'Melanie2012-02-262-3/+41
|\
| * added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵UbitUmarov2012-02-262-3/+41
| | | | | | | | data.
| * Implement KeyframedMotion selection behaviorMelanie2012-02-263-2/+37
| |
* | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-262-0/+18
| | | | | | | | periodically.
* | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-268-41/+75
| | | | | | | | other way because SOG doesn't technically exist in the DB
* | Implement proper selection behaviorMelanie2012-02-263-2/+37
|/
* Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-265-11/+9
| | | | code.
* Fix an infinite recursion caused by checking the wrong values forMelanie2012-02-261-24/+27
| | | | Buoyancy, Force and Torque
* Serialize Keyframe motion for region crossingsMelanie2012-02-264-4/+96
|
* Zero force and torque on take so that items don't run away when rezzedMelanie2012-02-261-0/+2
|
* Merge branch 'ubitwork'Melanie2012-02-263-35/+98
|\
| * changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵UbitUmarov2012-02-253-35/+98
| | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
* | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-269-2/+493
|/
* Delay the sending of the initial werables update until the inventory andMelanie2012-02-252-8/+12
| | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login
* Merge branch 'ubitwork'Melanie2012-02-241-5/+21
|\
| * replace bad meshs by a small cube and log it.UbitUmarov2012-02-241-5/+21
| |
* | Try not to send the avatar updates on login. This may mean loggin in withMelanie2012-02-241-1/+2
| | | | | | | | invisible attachments again but could help the appearance issues.
* | Add a cache on GridService requestsMelanie2012-02-241-0/+10
|/
* stop using useless geom tricallback.UbitUmarov2012-02-241-1/+2
|
* Prevent a nullref when nonphysical motion objects cross sim boundariesMelanie2012-02-231-1/+1
|
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-232-6/+9
|\
| * Partially apply the core banlines fixMelanie2012-02-232-6/+9
| |
* | Correct sit position calculationsMelanie2012-02-231-2/+2
|/
* Fix preserving the animation state of a crossing seated avatarMelanie2012-02-231-2/+10
|
* Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-232-0/+11
| | | | | update attachments on child avatars or intermingle agent and attachment updates, which would render the root prim of huds invisible
* Merge branch 'ubitwork'Melanie2012-02-231-3/+5
|\
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-2311-31/+94
| |\
| * | fix the last fix. Regions are square but... Also remove the 0.5 offset in ↵UbitUmarov2012-02-231-1/+3
| | | | | | | | | | | | map position. It was apparently needed to fix we having nsamples = size and not size + 1.
| * | fix my bug on ChODE terrain heightmap buildUbitUmarov2012-02-231-3/+3
| | |
* | | Show avatars as sitting on proot prims only to avoid motion jitterMelanie2012-02-231-5/+31
| |/ |/| | | | | for passengers
* | Merge branch 'master' into careminsterMelanie2012-02-238-29/+28
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
| |\ \
| | * | Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵Justin Clark-Casey (justincc)2012-02-221-8/+2
| | | | | | | | | | | | | | | | constructor and never subsequent set to null.
| * | | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-238-18/+25
| |/ / | | | | | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | | Add permission checks to scripted object movements, which didn't respect bansMelanie2012-02-233-1/+59
| | | | | | | | | | | | | | | and parcel settings until now. Add llSetRegionPos() function according to LL spec
* | | Count agents for LSL instead of relying on SceneGraph to have the correctMelanie2012-02-221-1/+7
| |/ |/| | | | | value. Fixes a reported glitch.
* | Adjust sit target and the llSetLinkPrimitiveParams sit position hackMelanie2012-02-222-16/+68
| | | | | | | | to match SL.
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+9
|\ \ | |/
| * Restore the taskItem null check that I accidentally blatted in 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
| | | | | | | | This is a valid check because the caller could supply an invalid uuid.
* | Merge branch 'master' into careminsterMelanie2012-02-211-1/+1
|\ \ | |/
| * Fix:LINK_ROOT flag for llGetLinkName() by SinglePrimPixelTomsen2012-02-211-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-02-212-35/+5
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-212-30/+4
| | | | | | | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569
| * Revert "Fix:Cannot drag inventory from child prim into inventory ↵Justin Clark-Casey (justincc)2012-02-211-8/+4
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way.
* | Reverse the changed to ODE heightmap. It results in SERIOUS issues like anMelanie2012-02-211-4/+4
| | | | | | | | irreversible y-flip and holes in the map.
* | Merge branch 'master' into careminsterMelanie2012-02-211-4/+8
|\ \ | |/
| * Fix:Cannot drag inventory from child prim into inventory ↵PixelTomsen2012-02-211-4/+8
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5569
* | Also preserve angular velocity on crossing.Melanie2012-02-211-0/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-02-2115-954/+68
|\ \ | |/ | | | | Conflicts:
| * Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.Justin Clark-Casey (justincc)2012-02-211-0/+3
| | | | | | | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert.