diff options
author | dahlia | 2014-01-20 03:02:30 -0800 |
---|---|---|
committer | dahlia | 2014-01-20 03:02:30 -0800 |
commit | 95c926b2cd8585dd5b84ad7827d21b6122ea1001 (patch) | |
tree | 4fd838c1534298698af82e1e4a03fcb2911d0dde /OpenSim | |
parent | Add code to convert legacy materials stored in DynAttrs to new asset format a... (diff) | |
download | opensim-SC-95c926b2cd8585dd5b84ad7827d21b6122ea1001.zip opensim-SC-95c926b2cd8585dd5b84ad7827d21b6122ea1001.tar.gz opensim-SC-95c926b2cd8585dd5b84ad7827d21b6122ea1001.tar.bz2 opensim-SC-95c926b2cd8585dd5b84ad7827d21b6122ea1001.tar.xz |
delay texture entry parsing until absolutely necessary while converting legacy materials
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index 1b5a7a3..d8ec979 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |||
@@ -159,10 +159,6 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
159 | if (part.DynAttrs == null) | 159 | if (part.DynAttrs == null) |
160 | return; | 160 | return; |
161 | 161 | ||
162 | var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length); | ||
163 | if (te == null) | ||
164 | return; | ||
165 | |||
166 | OSD OSMaterials = null; | 162 | OSD OSMaterials = null; |
167 | OSDArray matsArr = null; | 163 | OSDArray matsArr = null; |
168 | 164 | ||
@@ -187,6 +183,10 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
187 | if (matsArr == null) | 183 | if (matsArr == null) |
188 | return; | 184 | return; |
189 | 185 | ||
186 | var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length); | ||
187 | if (te == null) | ||
188 | return; | ||
189 | |||
190 | foreach (OSD elemOsd in matsArr) | 190 | foreach (OSD elemOsd in matsArr) |
191 | { | 191 | { |
192 | if (elemOsd != null && elemOsd is OSDMap) | 192 | if (elemOsd != null && elemOsd is OSDMap) |