Merge branch 'master' into ghosts

Fix recent regression from 473c5594 where camera started to judder on moving vehicles.
2014-09-09 17:22:09 +01:00 · 2014-09-03 00:26:53 +01:00 · 2014-09-02 23:35:03 +01:00 · 2014-09-02 19:00:14 +01:00 · 2014-09-02 18:34:54 +01:00 · 2014-08-26 18:52:50 +01:00
2 changed files with 1 additions and 1 deletions
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -231,7 +231,7 @@ public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeM
    { CollisionType.Avatar,
                new CollisionTypeFilterGroup(CollisionType.Avatar,
                                (uint)CollisionFilterGroups.BCharacterGroup,
-                                (uint)CollisionFilterGroups.BAllGroup)
+                                (uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BCharacterGroup))
    },
    { CollisionType.Groundplane,
                new CollisionTypeFilterGroup(CollisionType.Groundplane,
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Author	SHA1	Message	Date
Justin Clark-Casey (justincc)	e76cc35409	Merge branch 'master' into ghosts	2014-09-09 17:22:09 +01:00
Justin Clark-Casey (justincc)	a129e9e351	Merge branch 'master' into ghosts	2014-09-03 00:26:53 +01:00
Justin Clark-Casey (justincc)	3c7eacf39b	Fix recent regression from `473c5594` where camera started to judder on moving vehicles. Other parts of OpenSimulator are relying on SP.Velocity == 0 for vehicles. So add and use SP.GetWorldVelocity() instead when we need vehicle velocity, along the same lines as existing SP.GetWorldRotation()	2014-09-02 23:35:03 +01:00
Justin Clark-Casey (justincc)	cd6f73392a	Reinsert OpenMetaverse.dll from commit `fbdf507` from an accidental replace in `f1f935e` This only affected pCampbot.	2014-09-02 19:00:14 +01:00
Justin Clark-Casey (justincc)	1559a3a099	Merge branch 'master' into ghosts	2014-09-02 18:34:54 +01:00
Justin Clark-Casey (justincc)	6520065625	Merge branch 'master' into ghosts	2014-08-26 18:52:50 +01:00
Justin Clark-Casey (justincc)	693bfdc0fb	Merge branch 'master' into ghosts	2014-08-26 18:26:27 +01:00
Justin Clark-Casey (justincc)	f3eaa6d81e	Temporary hack to disable av to av collisions in bulletsim. Need to do this for a test. Final implementation will be properly controlled through a property.	2014-08-26 18:17:09 +01:00