Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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. | |||||
* | | Add a cache on GridService requests | Melanie | 2012-02-24 | 1 | -0/+10 | |
|/ | ||||||
* | 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 | 11 | -31/+94 | |
| |\ | ||||||
| * | | 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 | 8 | -29/+28 | |
|\ \ | | | | | | | | | | | | | 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 | 8 | -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 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 | 15 | -954/+68 | |
|\ \ | |/ | | | | | 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 | 9 | -14/+51 | |
| | | ||||||
| * | Fix bug where NPCs would establish child agents on other neighbour regions ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -15/+14 | |
| | | | | | | | | that had come up after the NPC was created. | |||||
| * | Remove PhysXPlugin and wrappers. | Justin Clark-Casey (justincc) | 2012-02-21 | 5 | -1001/+0 | |
| | | | | | | | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support. | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-20 | 4 | -13/+23 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-02-20 | 4 | -13/+23 | |
| |\ \ | | |/ | ||||||
| | * | Amend to last commit: synchronize access to queues. | Diva Canto | 2012-02-20 | 1 | -2/+5 | |
| | | | ||||||
| | * | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 2 | -11/+16 | |
| | | | | | | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail. | |||||
| | * | One more tweak related to the previous 2 commits. | Diva Canto | 2012-02-19 | 1 | -1/+3 | |
| | | | ||||||
| | * | Amend to last commit. This should have been committed too. | Diva Canto | 2012-02-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | Make vehicles retain velocity when crossing between regions. | Melanie | 2012-02-20 | 1 | -0/+4 | |
| | | | ||||||
* | | | Add an override to make SOG.Velocity work as expected | Melanie | 2012-02-20 | 1 | -0/+6 | |
|/ / | ||||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 4 | -18/+29 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 4 | -18/+29 | |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-02-19 | 3 | -10/+11 | |
| | |\ |