| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Try to resolve some problems with viewers crashing after hitting parcel ↵ | Justin Clark-Casey (justincc) | 2012-02-23 | 3 | -16/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822 | ||||
| * | | | 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 | 22 | -979/+68 |
| |\ \ | |/ | | | | | Conflicts: | ||||
| | * | Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+0 |
| | | | | | | | | | bit one in lib64 | ||||
| | * | Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate. | Justin Clark-Casey (justincc) | 2012-02-21 | 3 | -0/+3 |
| | | | | | | | | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert. | ||||
| | * | Replace previous windows 64-bit sqlite3.dll with one from ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not. This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference. This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet). | ||||
| | * | Replace win 64-bit sqlite3.dll with another version, though I suspect this ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+0 |
| | | | | | | | | | one won't work either. | ||||
| | * | Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process. | Justin Clark-Casey (justincc) | 2012-02-21 | 11 | -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 | 8 | -1026/+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 |
| | | |\ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |