Commit Graph

18740 Commits (fc781f089446faec4710872001dd3382419bf2e8)

Author SHA1 Message Date
UbitUmarov fc781f0894 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-03-03 17:08:01 +00:00
Melanie bfcba0a417 This still causes terrain artefacts
Revert " fix my bug on ChODE terrain heightmap build"

This reverts commit aa77d1d486.
2012-03-02 22:20:02 +01:00
Melanie 458f295fdb This still causes terrain artefacts
Revert " 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."

This reverts commit 15bc539bd4.
2012-03-02 22:19:28 +01:00
UbitUmarov f42fd7fb77 update ubitODE 2012-03-02 15:05:30 +00:00
UbitUmarov ee4d3bfad2 ubitODE bug fix 2012-02-29 19:36:16 +00:00
UbitUmarov a8f1cd7e86 update ubitODE to current working state 2012-02-29 19:32:23 +00:00
UbitUmarov a0d75be56b fix 2012-02-29 05:14:29 +00:00
UbitUmarov 42ddb0e88f Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-29 05:08:13 +00:00
UbitUmarov 5534cf8b57 chODE: bad meshs get a a basic box or sphere geom with setted prim size. They will not colide if non-physical and Will collide with land if physical. assume UNTESTED 2012-02-29 05:03:26 +00:00
UbitUmarov a8a7bb549d made box a little larger 2012-02-28 20:24:03 +00:00
UbitUmarov 1c7700db88 A few blind changes to go try to go around bad mesh little box replacement fail 2012-02-28 20:14:26 +00:00
Melanie f11ab97747 Fix and hook up llTeleportAgent 2012-02-28 20:51:19 +01:00
Melanie 0fb50a8a9e Implement llTeleportAgent 2012-02-28 20:48:31 +01:00
Melanie 9bad3b846f Really dirty hack to make sims start. Causes errors but the ting runs. Remove
when fixed right.
2012-02-28 10:37:46 +01:00
UbitUmarov a725b5e01e Let inworld meshs colide as such and not as basic prim all the time. Removed also LOD, and outerskin on colision meshs. 2012-02-27 20:08:43 +00:00
Melanie 960c575dd2 Merge branch 'ubitwork' 2012-02-27 10:35:38 +01:00
Melanie aee4ca2f1c Fix vehicles going physical stopping llTargetOmega parts (boat radar) 2012-02-27 08:50:19 +01:00
Melanie d342008e5b Fix NPC appearance setting to include attachments again 2012-02-27 08:49:19 +01:00
UbitUmarov 0d51c42f59 update ubitODE to my current working state 2012-02-27 02:10:03 +00:00
UbitUmarov f451f67213 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-27 01:31:29 +00:00
Melanie d46235f5a3 Merge branch 'ubitwork' 2012-02-26 21:17:31 +01:00
Melanie e5e5b94cbe Make llSetKeyframedMotion prims waut at the borders of down sims and try again
periodically.
2012-02-26 21:16:24 +01:00
UbitUmarov d8ecc28df5 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-02-26 18:43:56 +00:00
UbitUmarov 118986f150 added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data. 2012-02-26 17:51:43 +00:00
Melanie fca8c82232 Move KeyframeMotion from SOG to SOP because we can't persist it any
other way because SOG doesn't technically exist in the DB
2012-02-26 18:11:38 +01:00
Melanie 356603fff9 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
2012-02-26 15:15:47 +01:00
Melanie ac1e30156a Implement proper selection behavior 2012-02-26 15:09:00 +01:00
Melanie 416f39a561 Implement KeyframedMotion selection behavior 2012-02-26 15:06:05 +01:00
Melanie 8cdc115c91 Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
code.
2012-02-26 14:30:24 +01:00
Melanie 9a15bba99b Fix an infinite recursion caused by checking the wrong values for
Buoyancy, Force and Torque
2012-02-26 13:31:29 +01:00
Melanie aa552d0526 Serialize Keyframe motion for region crossings 2012-02-26 12:29:35 +01:00
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