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

delay texture entry parsing until absolutely necessary while converting legacy materials

Browse Source
This commit is contained in:
dahlia
2014-01-20 03:02:30 -08:00
parent 28723beb0c
commit 95c926b2cd
1 changed files with 4 additions and 4 deletions
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)
return;
var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
if (te == null)
return;
OSD OSMaterials = null;
OSDArray matsArr = null;
@@ -187,6 +183,10 @@ namespace OpenSim.Region.OptionalModules.Materials
if (matsArr == null)
return;
var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
if (te == null)
return;
foreach (OSD elemOsd in matsArr)
{
if (elemOsd != null && elemOsd is OSDMap)