ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2013-01-16 01:11:20 +00:00
parent b924e333b7 8bf0a9f85d
commit fc5711fa7a
29 changed files with 512 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -4649,9 +4649,9 @@ namespace OpenSim.Region.Framework.Scenes
PhysicsShapeType,
m_localId);
}
catch (Exception ex)
catch (Exception e)
{
m_log.ErrorFormat("[SCENE]: AddToPhysics object {0} failed: {1}", m_uuid, ex.Message);
m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom. e={1}", m_uuid, e);
pa = null;
}
@@ -5288,4 +5288,4 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
}
}