5 files changed, 71 insertions, 93 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f2df364..339fc15 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2454,6 +2454,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="remoteClient"></param>
         /// <param name="itemID"></param>
+        /// <param name="rezGroupID"></param>
         /// <param name="RayEnd"></param>
         /// <param name="RayStart"></param>
         /// <param name="RayTargetID"></param>
@@ -2464,7 +2465,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="RezSelected"></param>
         /// <param name="RemoveItem"></param>
         /// <param name="fromTaskID"></param>
-        public virtual void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
+        public virtual void RezObject(IClientAPI remoteClient, UUID itemID, UUID rezGroupID,
+                                    Vector3 RayEnd, Vector3 RayStart,
                                     UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                                     bool RezSelected, bool RemoveItem, UUID fromTaskID)
         {
@@ -2477,7 +2479,7 @@ namespace OpenSim.Region.Framework.Scenes
                 IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>();
                 if (invAccess != null)
                     invAccess.RezObject(
-                        remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
+                        remoteClient, itemID, rezGroupID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
                         RezSelected, RemoveItem, fromTaskID, false);
             }
             else
@@ -2504,8 +2506,7 @@ namespace OpenSim.Region.Framework.Scenes
                                
                 byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
                 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
-                Vector3 pos 
-                    = GetNewRezLocation(
+                Vector3 pos = GetNewRezLocation(
                         RayStart, RayEnd, RayTargetID, Quaternion.Identity,
                         BypassRayCast, bRayEndIsIntersection, true, scale, false);            
                 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 00e699e..33418e6 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3115,14 +3115,9 @@ namespace OpenSim.Region.Framework.Scenes
                         || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
     
                 CheckHeartbeat();
-    
 
                 sp = GetScenePresence(client.AgentId);
 
-                // XXX: Not sure how good it is to add a new client if a scene presence already exists.  Possibly this
-                // could occur if a viewer crashes and relogs before the old client is kicked out.  But this could cause
-                // other problems, and possibly the code calling AddNewAgent() should ensure that no client is already
-                // connected.
                 if (sp == null)
                 {
                     m_log.DebugFormat(
@@ -3137,15 +3132,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                     sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags;
 
-/* done in completMovement
-                    InventoryFolderBase cof = InventoryService.GetFolderForType(client.AgentId, (AssetType)46);
-                    if (cof == null)
-                        sp.COF = UUID.Zero;
-                    else
-                        sp.COF = cof.ID;
-
-                    m_log.DebugFormat("[SCENE]: COF for {0} is {1}", client.AgentId, sp.COF);
- */
                     m_eventManager.TriggerOnNewPresence(sp);
                 }
                 else
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0b8076a..0847b0b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2712,8 +2712,7 @@ namespace OpenSim.Region.Framework.Scenes
             detobj.velVector = obj.Velocity;
             detobj.colliderType = 0;
             detobj.groupUUID = obj.GroupID;
-            detobj.linkNumber = LinkNum; // pass my link number
-
+            detobj.linkNumber = LinkNum;
             return detobj;
         }
 
@@ -2726,9 +2725,13 @@ namespace OpenSim.Region.Framework.Scenes
             detobj.posVector = av.AbsolutePosition;
             detobj.rotQuat = av.Rotation;
             detobj.velVector = av.Velocity;
-            detobj.colliderType = 0;
+            detobj.colliderType = av.isNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs
+            if(av.IsSatOnObject)
+                detobj.colliderType |= 0x4; //passive
+            else if(detobj.velVector != Vector3.Zero)
+                detobj.colliderType |= 0x2; //active
             detobj.groupUUID = av.ControllingClient.ActiveGroupId;
-            detobj.linkNumber = LinkNum; // pass my link number
+            detobj.linkNumber = LinkNum;
 
             return detobj;
         }
@@ -2842,7 +2845,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup.Scene == null || ParentGroup.IsDeleted)
                 return;
 
-            // single threaded here
+            // this a thread from physics ( heartbeat )
+
             CollisionEventUpdate a = (CollisionEventUpdate)e;
             Dictionary<uint, ContactPoint> collissionswith = a.m_objCollisionList;
             List<uint> thisHitColliders = new List<uint>();
@@ -2860,7 +2864,6 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 m_lastColliders.Clear();
             }
-
             else
             {
                 List<CollisionForSoundInfo> soundinfolist = new List<CollisionForSoundInfo>();
@@ -5256,7 +5259,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
             {
                 // subscribe to physics updates.
                 pa.OnCollisionUpdate += PhysicsCollision;
-                pa.SubscribeEvents(50); // 20 reports per second
+                pa.SubscribeEvents(100); // 10 reports per second
             }
             else
             {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e985903..732d5ef 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Region.Framework.Scenes
                             return true;
                         if (!land.LandData.GroupAVSounds)
                             return false;
-                        return land.LandData.GroupID == ControllingClient.ActiveGroupId;
+                        return ControllingClient.IsGroupMember(land.LandData.GroupID);
                     }
                 }
                 catch
@@ -1094,6 +1094,8 @@ namespace OpenSim.Region.Framework.Scenes
                     m_LandingPointBehavior = LandingPointBehavior.SL;
             }
 
+            ControllingClient.RefreshGroupMembership();
+
         }
 
         private float lastHealthSent = 0;
@@ -1978,7 +1980,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if(!haveGroupInformation && !IsChildAgent && !isNPC)
                 {
-                    // oh crap.. lets retry it directly
                     IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
                     if (gm != null)
                         Grouptitle = gm.GetGroupTitle(m_uuid);
@@ -2195,13 +2196,14 @@ namespace OpenSim.Region.Framework.Scenes
                     if (friendsModule != null)
                     { 
                         if(gotCrossUpdate)
-                            friendsModule.IsNpwRoot(this);
+                            friendsModule.IsNowRoot(this);
                         else
                             friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
                     }
-                    m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms", Util.EnvironmentTickCountSubtract(ts));
+                    m_log.DebugFormat("[CompleteMovement] friendsModule: {0}ms",    Util.EnvironmentTickCountSubtract(ts));
 
                 }
+
             }
             finally
             {
@@ -2214,7 +2216,7 @@ namespace OpenSim.Region.Framework.Scenes
  //               m_currentParcelHide = newhide;
  //           }
 
-            haveGroupInformation = true;
+            haveGroupInformation = false;
             gotCrossUpdate = false;
             crossingFlags = 0;
 
@@ -4547,24 +4549,12 @@ namespace OpenSim.Region.Framework.Scenes
             else
                  cAgent.CrossingFlags = 0;           
 
-            if(isCrossUpdate && haveGroupInformation)
+            if(isCrossUpdate)
             {
                 cAgent.agentCOF = COF;
                 cAgent.ActiveGroupID = ControllingClient.ActiveGroupId;
                 cAgent.ActiveGroupName = ControllingClient.ActiveGroupName;
                 cAgent.ActiveGroupTitle = Grouptitle;
-                Dictionary<UUID, ulong> gpowers = ControllingClient.GetGroupPowers();
-                if(gpowers.Count >0)
-                {
-                    cAgent.Groups = new AgentGroupData[gpowers.Count];
-                    int i = 0;
-                    foreach (UUID gid in gpowers.Keys)
-                    {
-                        // WARNING we dont' have AcceptNotices in cache.. sending as true mb no one notices ;)
-                        AgentGroupData agd = new AgentGroupData(gid,gpowers[gid],true);
-                        cAgent.Groups[i++] = agd;
-                    }
-                }
             }
         }
 
@@ -4661,46 +4651,32 @@ namespace OpenSim.Region.Framework.Scenes
             if (Scene.AttachmentsModule != null)
                 Scene.AttachmentsModule.CopyAttachments(cAgent, this);
 
-            haveGroupInformation = false;
+            crossingFlags = cAgent.CrossingFlags;
+            gotCrossUpdate = (crossingFlags != 0);
 
+            haveGroupInformation = false;
             // using this as protocol detection don't want to mess with the numbers for now
             if(cAgent.ActiveGroupTitle != null)
             {
+                haveGroupInformation = true;
                 COF = cAgent.agentCOF;
-                ControllingClient.ActiveGroupId = cAgent.ActiveGroupID;
-                ControllingClient.ActiveGroupName = cAgent.ActiveGroupName;
-                ControllingClient.ActiveGroupPowers = 0;
-                Grouptitle = cAgent.ActiveGroupTitle;
-                
-                if(cAgent.Groups != null && cAgent.Groups.Length > 0)
+                if(ControllingClient.IsGroupMember(cAgent.ActiveGroupID))
                 {
-                    int ngroups = cAgent.Groups.Length;
-                    Dictionary<UUID, ulong> gpowers = new Dictionary<UUID, ulong>(ngroups);
-                    for(int i = 0 ; i < ngroups; i++)
-                    {
-                        AgentGroupData agd = cAgent.Groups[i];
-                        gpowers[agd.GroupID] = agd.GroupPowers;
-                    }
-
-                    ControllingClient.SetGroupPowers(gpowers);
-
-                    if(cAgent.ActiveGroupID == UUID.Zero)
-                        haveGroupInformation = true;
-                    else if(gpowers.ContainsKey(cAgent.ActiveGroupID))
-                    {
-                        ControllingClient.ActiveGroupPowers = gpowers[cAgent.ActiveGroupID];
-                        haveGroupInformation = true;
-                    }
+                    ControllingClient.ActiveGroupId = cAgent.ActiveGroupID;
+                    ControllingClient.ActiveGroupName = cAgent.ActiveGroupName;
+                    Grouptitle = cAgent.ActiveGroupTitle;
+                    ControllingClient.ActiveGroupPowers = 
+                            ControllingClient.GetGroupPowers(cAgent.ActiveGroupID);
                 }
-                else if(cAgent.ActiveGroupID == UUID.Zero)
+                else
                 {
-                    haveGroupInformation = true;
+                    // we got a unknown active group so get what groups thinks about us
+                    IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
+                    if (gm != null)
+                        gm.SendAgentGroupDataUpdate(ControllingClient);
                 }
             }
 
-            crossingFlags = cAgent.CrossingFlags;
-            gotCrossUpdate = (crossingFlags != 0);
-
             lock (m_originRegionIDAccessLock)
                 m_originRegionID = cAgent.RegionID;
         }
@@ -6061,7 +6037,11 @@ namespace OpenSim.Region.Framework.Scenes
             detobj.posVector = av.AbsolutePosition;
             detobj.rotQuat = av.Rotation;
             detobj.velVector = av.Velocity;
-            detobj.colliderType = 0;
+            detobj.colliderType = av.isNPC ? 0x20 : 0x1; // OpenSim\Region\ScriptEngine\Shared\Helpers.cs
+            if(av.IsSatOnObject)
+                detobj.colliderType |= 0x4; //passive
+            else if(detobj.velVector != Vector3.Zero)
+                detobj.colliderType |= 0x2; //active
             detobj.groupUUID = av.ControllingClient.ActiveGroupId;
             detobj.linkNumber = 0;
 
@@ -6153,9 +6133,6 @@ namespace OpenSim.Region.Framework.Scenes
                 List<uint> thisHitColliders = new List<uint>();
                 List<uint> endedColliders = new List<uint>();
                 List<uint> startedColliders = new List<uint>();
-                List<CollisionForSoundInfo> soundinfolist = new List<CollisionForSoundInfo>();
-                CollisionForSoundInfo soundinfo;
-                ContactPoint curcontact;
 
                 if (coldata.Count == 0)
                 {
@@ -6168,30 +6145,41 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                     m_lastColliders.Clear();
                 }
-
                 else
                 {
-                    bool candoparcelSound = ParcelAllowThisAvatarSounds;
-
-                    foreach (uint id in coldata.Keys)
+                    List<CollisionForSoundInfo> soundinfolist = new List<CollisionForSoundInfo>();
+                    if(ParcelAllowThisAvatarSounds)
                     {
-                        thisHitColliders.Add(id);
-                        if (!m_lastColliders.Contains(id))
+                        CollisionForSoundInfo soundinfo;
+                        ContactPoint curcontact;
+
+                        foreach (uint id in coldata.Keys)
                         {
-                            startedColliders.Add(id);
-                            curcontact = coldata[id];
-                            if (candoparcelSound && Math.Abs(curcontact.RelativeSpeed) > 0.2)
+                            thisHitColliders.Add(id);
+                            if (!m_lastColliders.Contains(id))
                             {
-                                soundinfo = new CollisionForSoundInfo();
-                                soundinfo.colliderID = id;
-                                soundinfo.position = curcontact.Position;
-                                soundinfo.relativeVel = curcontact.RelativeSpeed;
-                                soundinfolist.Add(soundinfo);
+                                startedColliders.Add(id);
+                                curcontact = coldata[id];
+                                if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
+                                {
+                                    soundinfo = new CollisionForSoundInfo();
+                                    soundinfo.colliderID = id;
+                                    soundinfo.position = curcontact.Position;
+                                    soundinfo.relativeVel = curcontact.RelativeSpeed;
+                                    soundinfolist.Add(soundinfo);
+                                }
                             }
                         }
-                        //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
                     }
-
+                    else
+                    {
+                        foreach (uint id in coldata.Keys)
+                        {
+                            thisHitColliders.Add(id);
+                            if (!m_lastColliders.Contains(id))
+                                startedColliders.Add(id);
+                        }
+                    }
                     // calculate things that ended colliding
                     foreach (uint localID in m_lastColliders)
                     {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index 75b073d..142ad84 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Framework.Tests
             //Assert.That((retrievedItem1.CurrentPermissions & (uint)OpenMetaverse.PermissionMask.All) == (uint)OpenMetaverse.PermissionMask.All);
 
             // Rez the object
-            scene.RezObject(sp2.ControllingClient, retrievedItem1.ID, Vector3.Zero, Vector3.Zero, UUID.Zero, 0, false, false, false, UUID.Zero);
+            scene.RezObject(sp2.ControllingClient, retrievedItem1.ID, UUID.Zero, Vector3.Zero, Vector3.Zero, UUID.Zero, 0, false, false, false, UUID.Zero);
             SceneObjectGroup sog = scene.GetSceneObjectGroup("SomeObject");
             Assert.That(sog, Is.Not.Null);