From f0f684161eaf7481076cff63e794e01f654d627c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 19 Jun 2010 08:51:07 -0700
Subject: Reinstated the behavior of AddPrimShape *exactly* as it was as of
 December. Trying to fix mantis #4777

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 100f98d..f84c505 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1772,16 +1772,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             if (needsMeshing(pbs))
             {
-                try
-                {
-                    mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
-                }
-                catch(Exception e)
-                {
-                    m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName);
-                    m_log.Debug(e.ToString());
-                    mesh = null;
-                }
+                mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
             }
 
             result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);
-- 
cgit v1.1


From 9b410f5e94b2969fbd1004560eae567d1c950666 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 19 Jun 2010 09:25:36 -0700
Subject: Reverting my last two commits, putting back Melanie's exception
 handler. Doesn't solve #4777.

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index f84c505..100f98d 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1772,7 +1772,16 @@ namespace OpenSim.Region.Physics.OdePlugin
 
             if (needsMeshing(pbs))
             {
-                mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
+                try
+                {
+                    mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
+                }
+                catch(Exception e)
+                {
+                    m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName);
+                    m_log.Debug(e.ToString());
+                    mesh = null;
+                }
             }
 
             result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);
-- 
cgit v1.1


From 1e7ce6dbced67350214f921566f39a3d1413e9bb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 19 Jun 2010 09:44:02 -0700
Subject: Hunting for the problem in #4777

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ++++
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs      | 1 +
 2 files changed, 5 insertions(+)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 38b2dc2..59fd805 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1487,6 +1487,10 @@ namespace OpenSim.Region.Framework.Scenes
                         DoPhysicsPropertyUpdate(RigidBody, true);
                         PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
                     }
+                    else
+                    {
+                        m_log.DebugFormat("[SPEW]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID);
+                    }
                 }
             }
         }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 100f98d..7fd59a0 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1781,6 +1781,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName);
                     m_log.Debug(e.ToString());
                     mesh = null;
+                    return null;
                 }
             }
 
-- 
cgit v1.1


From 24a68e36fb07e4366c8f9f680bcbbf85ac92b2f3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 19 Jun 2010 12:32:36 -0700
Subject: Bug fix: wrong name of requester in local friendship offer.

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 80982fd..5552be7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 UUID principalID = new UUID(im.fromAgentID);
                 UUID friendID = new UUID(im.toAgentID);
 
-                m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID);
+                m_log.DebugFormat("[FRIENDS]: {0} ({1}) offered friendship to {2}", principalID, im.fromAgentName, friendID);
 
                 // This user wants to be friends with the other user.
                 // Let's add the relation backwards, in case the other is not online
@@ -521,6 +521,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             im.imSessionID = im.fromAgentID;
 
             // Try the local sim
+            UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID);
+            im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
+            
             if (LocalFriendshipOffered(friendID, im))
                 return;
 
-- 
cgit v1.1