Commit Graph

18709 Commits (edc78defed18a0eb735097dc64ea5e0ed722caac)

Author SHA1 Message Date
Melanie edc78defed Zero force and torque on take so that items don't run away when rezzed 2012-02-26 02:52:08 +01:00
Melanie e9120890a2 Merge branch 'ubitwork' 2012-02-26 02:41:41 +01:00
Melanie c82709c0d6 Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. 2012-02-26 02:36:34 +01:00
UbitUmarov e07440d0c5 changed SOP Force and Torque, adding XML (de/)serialization, also changed 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) 2012-02-25 22:20:25 +00:00
UbitUmarov 7b6649177e Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-25 17:51:12 +00:00
Melanie 5eb1679367 Delay the sending of the initial werables update until the inventory and
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
2012-02-25 12:25:16 +01:00
UbitUmarov efbfa832bb Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-24 22:25:13 +00:00
UbitUmarov 23679c3808 replace bad meshs by a small cube and log it. 2012-02-24 20:34:11 +00:00
Melanie 70b4bc8cf5 Merge branch 'ubitwork' 2012-02-24 19:48:39 +01:00
Melanie 991826ca76 Try not to send the avatar updates on login. This may mean loggin in with
invisible attachments again but could help the appearance issues.
2012-02-24 19:31:27 +01:00
UbitUmarov ec94b82f51 stop using useless geom tricallback. 2012-02-24 18:25:43 +00:00
Melanie 95f43ab73e Add a cache on GridService requests 2012-02-24 18:17:30 +01:00
UbitUmarov 5145980c74 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-24 02:13:43 +00:00
Melanie e74bf46007 Prevent a nullref when nonphysical motion objects cross sim boundaries 2012-02-23 23:18:01 +01:00
Melanie 7c520cf531 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2012-02-23 22:27:20 +01:00
Melanie daf58575f8 Partially apply the core banlines fix 2012-02-23 23:05:04 +00:00
Melanie e7cebaa4bd Merge branch 'master' into careminster 2012-02-23 22:50:31 +00:00
Justin Clark-Casey (justincc) 90ea00a109 Try to resolve some problems with viewers crashing after hitting parcel 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
2012-02-23 22:56:42 +00:00
Melanie 1c0adfa6e0 Correct sit position calculations 2012-02-23 22:26:17 +01:00
Melanie f3ea2bde61 Fix preserving the animation state of a crossing seated avatar 2012-02-23 20:32:35 +01:00
UbitUmarov 8994ab1336 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-23 14:50:49 +00:00
Melanie dc835717d6 Properly sequence updates of avatars and attachments so that we don't
update attachments on child avatars or intermingle agent and attachment
updates, which would render the root prim of huds invisible
2012-02-23 14:08:35 +01:00
Melanie f266c54f82 Merge branch 'ubitwork' 2012-02-23 13:10:02 +01:00
Melanie 56cc573d2f Show avatars as sitting on proot prims only to avoid motion jitter
for passengers
2012-02-23 12:20:20 +01:00
UbitUmarov e827bcaf2b Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-23 02:04:16 +00:00
Melanie f1a76195ea Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-23 01:49:14 +00:00
Melanie 9ed4245d9e Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-02-23 01:42:08 +00:00
Melanie 1dfc990264 Add a position parameter to region crossing of objects. This avoids the
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.
2012-02-23 01:40:30 +00:00
UbitUmarov 15bc539bd4 fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1. 2012-02-23 00:50:07 +00:00
UbitUmarov aa77d1d486 fix my bug on ChODE terrain heightmap build 2012-02-23 00:22:44 +00:00
Melanie c0b8f3d0bc Add permission checks to scripted object movements, which didn't respect bans
and parcel settings until now. Add llSetRegionPos() function according to
LL spec
2012-02-23 00:08:31 +01:00
Melanie 3796e08b59 Count agents for LSL instead of relying on SceneGraph to have the correct
value. Fixes a reported glitch.
2012-02-22 23:14:29 +01:00
Melanie 1e1270166f Adjust sit target and the llSetLinkPrimitiveParams sit position hack
to match SL.
2012-02-22 20:40:44 +01:00
Justin Clark-Casey (justincc) 5d31267185 Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in constructor and never subsequent set to null. 2012-02-22 00:55:16 +00:00
Melanie 65f5f60317 Merge branch 'master' into careminster 2012-02-21 23:43:39 +00:00
Justin Clark-Casey (justincc) cf9b3e7708 Restore the taskItem null check that I accidentally blatted in 5397a6d
This is a valid check because the caller could supply an invalid uuid.
2012-02-21 23:41:48 +00:00
Melanie 1273ec6c7d Merge branch 'master' into careminster 2012-02-21 23:17:39 +00:00
PixelTomsen 1c533eb520 Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim 2012-02-21 23:15:33 +00:00
Justin Clark-Casey (justincc) 5397a6d4c6 Fix problem with dragging child part inventory item to user inventory.
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
2012-02-21 22:54:30 +00:00
Melanie 24a49011cb Merge branch 'master' into careminster 2012-02-21 22:54:00 +00:00
Justin Clark-Casey (justincc) 76f411147d Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569"
This reverts commit 15ce73caca.

As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way.
2012-02-21 22:49:06 +00:00
PixelTomsen 15ce73caca Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569 2012-02-21 22:07:12 +00:00
Melanie cb4509f3b8 Reverse the changed to ODE heightmap. It results in SERIOUS issues like an
irreversible y-flip and holes in the map.
2012-02-21 21:34:02 +01:00
Melanie dede31174e Merge branch 'master' into careminster 2012-02-21 22:08:34 +00:00
Melanie 0e4d5a4d3c Also preserve angular velocity on crossing. 2012-02-21 10:10:04 +01:00
Melanie 03e7bc1526 Merge branch 'master' into careminster
Conflicts:
2012-02-21 10:20:56 +00:00
Justin Clark-Casey (justincc) a27e5a9c95 Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 bit one in lib64 2012-02-21 04:12:17 +00:00
Justin Clark-Casey (justincc) daee2eda93 Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
Justin Clark-Casey (justincc) a15b00d3ef Replace previous windows 64-bit sqlite3.dll with one from 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).
2012-02-21 04:01:27 +00:00
Justin Clark-Casey (justincc) 1b906ef2ad Replace win 64-bit sqlite3.dll with another version, though I suspect this one won't work either. 2012-02-21 03:24:01 +00:00