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

delay texture entry parsing until absolutely necessary while converting legacy materials

master-beforevarregion
dahlia 2014-01-20 03:02:30 -08:00
parent 28723beb0c
commit 95c926b2cd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
View File

@ -159,10 +159,6 @@ namespace OpenSim.Region.OptionalModules.Materials
if (part.DynAttrs == null) if (part.DynAttrs == null)
return; return;
var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
if (te == null)
return;
OSD OSMaterials = null; OSD OSMaterials = null;
OSDArray matsArr = null; OSDArray matsArr = null;
@ -187,6 +183,10 @@ namespace OpenSim.Region.OptionalModules.Materials
if (matsArr == null) if (matsArr == null)
return; return;
var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
if (te == null)
return;
foreach (OSD elemOsd in matsArr) foreach (OSD elemOsd in matsArr)
{ {
if (elemOsd != null && elemOsd is OSDMap) if (elemOsd != null && elemOsd is OSDMap)