OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-08-04 18:59:08 +02:00
parent dfb77330a8 92d44446fa
commit 8d5cce3138
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
View File

@ -596,9 +596,9 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
}
break;
case "R":
Font newFont = new Font(myFont, FontStyle.Regular);
Font anewFont = new Font(myFont, FontStyle.Regular);
myFont.Dispose();
myFont = newFont;
myFont = anewFont;
break;
}
}

21
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

@ -1092,18 +1092,21 @@ namespace OpenSim.Region.Physics.OdePlugin
CalcPrimBodyData();
m_mesh = null;
if (_parent_scene.needsMeshing(pbs))
if (_parent_scene.needsMeshing(pbs) && (pbs.SculptData.Length > 0))
{
bool convex;
int clod = (int)LevelOfDetail.High;
if (m_shapetype == 0)
convex = false;
else
{
convex = true;
m_mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, (int)LevelOfDetail.High, true, convex);
if (_pbs.SculptType != (byte)SculptType.Mesh)
clod = (int)LevelOfDetail.Low;
}
m_mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex);
}
m_building = true; // control must set this to false when done
AddChange(changes.Add, null);
@ -1360,12 +1363,18 @@ namespace OpenSim.Region.Physics.OdePlugin
if (m_mesh == null)
{
bool convex;
int clod = (int)LevelOfDetail.High;
if (m_shapetype == 0)
convex = false;
else
{
convex = true;
if (_pbs.SculptType != (byte)SculptType.Mesh)
clod = (int)LevelOfDetail.Low;
}
mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, (int)LevelOfDetail.High, true, convex);
mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, clod, true, convex);
}
else
{
@ -1373,7 +1382,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
if (mesh == null)
{
{
m_log.WarnFormat("[PHYSICS]: CreateMesh Failed on prim {0} at <{1},{2},{3}>.", Name, _position.X, _position.Y, _position.Z);
return false;
}