Commit Graph

25481 Commits (512c892d83786d44704706da86f97d887e4e445c)

Author SHA1 Message Date
UbitUmarov 05d071a430 let BlockingQueue timeout work as its suposed to and not wait for ever 2014-07-24 05:37:56 +01:00
UbitUmarov 6c3e08e18d revert my change of not adding physcis to a failed avatar transfer. This
may need a better fix later ( doing a stand elsewhere?)
2014-07-24 00:58:23 +01:00
UbitUmarov 9936f13c1b on transfer fail of sited avatars, only do 2014-07-24 00:56:48 +01:00
UbitUmarov 46695ddbfe fix line ending 2014-07-24 00:30:38 +01:00
UbitUmarov 8808549669 on sit use root prim camera at and eye if child as neither 2014-07-23 23:09:13 +01:00
UbitUmarov f6af5f4996 change last commit setting intransit without messing flight 2014-07-23 22:28:51 +01:00
UbitUmarov f9ae7ea2e6 do CompleteMovement with InTransit set as core 2014-07-23 21:14:35 +01:00
UbitUmarov 237075ce21 cleanup a bit presence CheckForBorderCrossing removing dead code 2014-07-23 20:31:54 +01:00
UbitUmarov d64a50ac9b changed locations of m_originRegionID setting to where current core has
them. Changed avatar AbsolutePosition, it still didnt assume m_pos as
 relative to root prim. ( forgot to commit before) ( this sit may still
 have loose ends, specially around the use of OffsetPosition that is now
 relative to root prim and was relative to prim)
2014-07-23 19:56:06 +01:00
UbitUmarov f236b2e5d3 request.DoHTTPGruntWork(..) is now identical to our version, so use
those again, getting code closer to os
 again
2014-07-23 02:14:15 +01:00
UbitUmarov 0331159d2c clamp avatar standup position within region 2014-07-22 21:34:21 +01:00
UbitUmarov f394fabfc0 if sited avatar cross fails, dont add it to physics and dont mess scripts
(?)
2014-07-22 16:28:30 +01:00
UbitUmarov fe900b28c6 CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so
revert previus change assuming it didnt. remove a no longer needed else {}
2014-07-22 15:56:20 +01:00
UbitUmarov ed905418b3 consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and
RETURN_AT_EDGE from simulation
2014-07-22 15:47:42 +01:00
UbitUmarov f9fdf26ec3 make ResetChildPrimPhysicsPositions only do what it is supposed to do and
not what AbsolutePosition does
2014-07-22 15:13:37 +01:00
UbitUmarov cf132430ae tell scripts about positions changes after they are actually changed 2014-07-22 14:50:17 +01:00
UbitUmarov 5269511339 dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sog 2014-07-22 14:31:47 +01:00
UbitUmarov 0e4a9e35c7 bug fix. Child position got broken because first prim i parts array may
not be the root prim
2014-07-22 04:10:51 +01:00
UbitUmarov 3e73e96bef fix HUD attachment update filter to allow avatar center etc 2014-07-22 01:49:42 +01:00
UbitUmarov 243499ea4e send updates on selected attachments as sl ( warinin if reverted then a
fix is needed elsewhere since the changes are never sent)
2014-07-22 01:11:18 +01:00
UbitUmarov 0239c7ba1c avatar collisions fix 2014-07-21 23:54:53 +01:00
UbitUmarov 5cdd205ee7 change presence movetotarget avoiding trying to go undergroud or fly when
it can walk. ( still needs better code )
2014-07-21 21:31:48 +01:00
UbitUmarov d9797b6478 change ava to ava collisions a bit 2014-07-21 19:16:23 +01:00
UbitUmarov 726490a994 bug fix 2014-07-21 19:15:51 +01:00
Melanie Thielker 72cead2920 Remove extremely spammy error message that isn't an actual error - user
ids queried may not exist, since LSL can use this as well, with
arbitrary ids
2014-07-20 23:58:46 +02:00
Melanie Thielker 34c40a1e1a Remove some already commented lines 2014-07-20 23:58:16 +02:00
Melanie Thielker c37a88d4f1 Fix LSL portions of sit positioning 2014-07-20 23:54:06 +02:00
UbitUmarov 719880a6ff make sittarget camera relative to root prim
Please enter the commit message for your changes. Lines starting
2014-07-20 20:20:59 +01:00
UbitUmarov 5f364dbed5 another change to standup 2014-07-20 16:09:34 +01:00
UbitUmarov d6f56a4f99 change avatar standup code 2014-07-20 16:03:05 +01:00
UbitUmarov a5fcc0c0c0 remove avn hack on sitted avatars positions 2014-07-20 14:47:35 +01:00
UbitUmarov 79aea3e588 physicsSit SendSitResponse also relative to parent prim 2014-07-20 09:21:00 +01:00
UbitUmarov 931434de87 fix physics sit for physical child prims 2014-07-20 09:15:29 +01:00
UbitUmarov 32b060a608 physics engine cannot change internal positions of linksets, at least not
in teaseupdates
2014-07-20 05:54:51 +01:00
Melanie Thielker b3068355bc Merge branch 'ubitworkmaster' 2014-07-20 02:27:08 +02:00
UbitUmarov dc717303d4 replace old Attachoffset by AttachedPos. Comented out possible merge
artifacts
2014-07-20 01:15:33 +01:00
Melanie Thielker bef76bf3c5 Fix duplicate attach message being sent to objects picked up from the ground 2014-07-20 01:52:26 +02:00
Melanie Thielker 95f0d582a5 Fix coalesced objects not showing up as "piles" of prims (AVN only bug) 2014-07-20 00:18:28 +02:00
Melanie Thielker 5000a5c038 Fix coalesced objects not showing up as "piles" of prims (AVN only bug) 2014-07-20 00:17:35 +02:00
Melanie Thielker b4a3ed1863 Merge branch 'ubitworkmaster' 2014-07-19 23:33:28 +02:00
Melanie Thielker 07c0ee1fbf Fix taking objects 2014-07-19 23:17:26 +02:00
UbitUmarov 5b8d1f0719 refix originalPositions[] 2014-07-19 22:16:59 +01:00
Melanie Thielker e1b2ecdfdc Merge branch 'avination-current'
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
UbitUmarov 95b89dd450 fix attachments 2014-07-19 22:18:12 +02:00
UbitUmarov 9654b81b2d revert to capsule representation of avatar collider 2014-07-19 16:16:13 +01:00
UbitUmarov 748fc66ef1 reduce avatar hover in basic ode plugin 2014-07-18 13:19:24 +01:00
UbitUmarov d5e0437465 fix Xengine script instance load 2014-07-18 11:43:31 +01:00
UbitUmarov 19d33c571d Merge branch 'avination-current' into ubitwork 2014-07-16 16:22:32 +01:00
UbitUmarov fc1bd4567d Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2014-07-16 16:16:37 +01:00
Melanie Thielker 159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00