Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ubitwork' | Melanie | 2012-02-26 | 2 | -3/+41 |
|\ | |||||
| * | added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵ | UbitUmarov | 2012-02-26 | 2 | -3/+41 |
| | | | | | | | | data. | ||||
| * | Implement KeyframedMotion selection behavior | Melanie | 2012-02-26 | 3 | -2/+37 |
| | | |||||
* | | Make llSetKeyframedMotion prims waut at the borders of down sims and try again | Melanie | 2012-02-26 | 2 | -0/+18 |
| | | | | | | | | periodically. | ||||
* | | Move KeyframeMotion from SOG to SOP because we can't persist it any | Melanie | 2012-02-26 | 7 | -39/+52 |
| | | | | | | | | other way because SOG doesn't technically exist in the DB | ||||
* | | Implement proper selection behavior | Melanie | 2012-02-26 | 3 | -2/+37 |
|/ | |||||
* | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new | Melanie | 2012-02-26 | 5 | -11/+9 |
| | | | | code. | ||||
* | Fix an infinite recursion caused by checking the wrong values for | Melanie | 2012-02-26 | 1 | -24/+27 |
| | | | | Buoyancy, Force and Torque | ||||
* | Serialize Keyframe motion for region crossings | Melanie | 2012-02-26 | 4 | -4/+96 |
| | |||||
* | Zero force and torque on take so that items don't run away when rezzed | Melanie | 2012-02-26 | 1 | -0/+2 |
| | |||||
* | Merge branch 'ubitwork' | Melanie | 2012-02-26 | 3 | -35/+98 |
|\ | |||||
| * | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵ | UbitUmarov | 2012-02-25 | 3 | -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. | Melanie | 2012-02-26 | 9 | -2/+493 |
|/ | |||||
* | Delay the sending of the initial werables update until the inventory and | Melanie | 2012-02-25 | 2 | -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' | Melanie | 2012-02-24 | 1 | -5/+21 |
|\ | |||||
| * | replace bad meshs by a small cube and log it. | UbitUmarov | 2012-02-24 | 1 | -5/+21 |
| | | |||||
* | | Try not to send the avatar updates on login. This may mean loggin in with | Melanie | 2012-02-24 | 1 | -1/+2 |
|/ | | | | invisible attachments again but could help the appearance issues. | ||||
* | stop using useless geom tricallback. | UbitUmarov | 2012-02-24 | 1 | -1/+2 |
| | |||||
* | Prevent a nullref when nonphysical motion objects cross sim boundaries | Melanie | 2012-02-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-23 | 2 | -6/+9 |
|\ | |||||
| * | Partially apply the core banlines fix | Melanie | 2012-02-23 | 2 | -6/+9 |
| | | |||||
* | | Correct sit position calculations | Melanie | 2012-02-23 | 1 | -2/+2 |
|/ | |||||
* | Fix preserving the animation state of a crossing seated avatar | Melanie | 2012-02-23 | 1 | -2/+10 |
| | |||||
* | Properly sequence updates of avatars and attachments so that we don't | Melanie | 2012-02-23 | 2 | -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' | Melanie | 2012-02-23 | 1 | -3/+5 |
|\ | |||||
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-23 | 8 | -26/+84 |
| |\ | |||||
| * | | fix the last fix. Regions are square but... Also remove the 0.5 offset in ↵ | UbitUmarov | 2012-02-23 | 1 | -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 build | UbitUmarov | 2012-02-23 | 1 | -3/+3 |
| | | | |||||
* | | | Show avatars as sitting on proot prims only to avoid motion jitter | Melanie | 2012-02-23 | 1 | -5/+31 |
| |/ |/| | | | | | for passengers | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 5 | -24/+18 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| * \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-23 | 1 | -8/+2 |
| |\ \ | |||||
| | * | | Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵ | Justin Clark-Casey (justincc) | 2012-02-22 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | constructor and never subsequent set to null. | ||||
| * | | | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 5 | -13/+15 |
| |/ / | | | | | | | | | | | | | | | | 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 bans | Melanie | 2012-02-23 | 3 | -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 correct | Melanie | 2012-02-22 | 1 | -1/+7 |
| |/ |/| | | | | | value. Fixes a reported glitch. | ||||
* | | Adjust sit target and the llSetLinkPrimitiveParams sit position hack | Melanie | 2012-02-22 | 2 | -16/+68 |
| | | | | | | | | to match SL. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | Restore the taskItem null check that I accidentally blatted in 5397a6d | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+9 |
| | | | | | | | | This is a valid check because the caller could supply an invalid uuid. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim | PixelTomsen | 2012-02-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 2 | -35/+5 |
|\ \ | |/ | |||||
| * | Fix problem with dragging child part inventory item to user inventory. | Justin Clark-Casey (justincc) | 2012-02-21 | 2 | -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-21 | 1 | -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 an | Melanie | 2012-02-21 | 1 | -4/+4 |
| | | | | | | | | irreversible y-flip and holes in the map. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -4/+8 |
|\ \ | |/ | |||||
| * | Fix:Cannot drag inventory from child prim into inventory ↵ | PixelTomsen | 2012-02-21 | 1 | -4/+8 |
| | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569 | ||||
* | | Also preserve angular velocity on crossing. | Melanie | 2012-02-21 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 7 | -954/+18 |
|\ \ | |/ | | | | | Conflicts: | ||||
| * | Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+3 |
| | | | | | | | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert. | ||||
| * | Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -14/+1 |
| | |