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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2019-08-02 04:28:34 +01:00
parent 04eb4744df
commit 482c51a42a
5 changed files with 22 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,24 +267,24 @@ namespace OpenSim.Region.OptionalModules.Materials
if (matsArr == null)
return partchanged;
OSD tmpOSD;
foreach (OSD elemOsd in matsArr)
{
if (elemOsd != null && elemOsd is OSDMap)
{
OSDMap matMap = elemOsd as OSDMap;
if (matMap.ContainsKey("ID") && matMap.ContainsKey("Material"))
OSD OSDID;
OSD OSDMaterial;
if (matMap.TryGetValue("ID", out OSDID) && matMap.TryGetValue("Material", out OSDMaterial) && OSDMaterial is OSDMap)
{
try
{
lock (materialslock)
{
tmpOSD = matMap["ID"];
UUID id = tmpOSD.AsUUID();
UUID id = OSDID.AsUUID();
if(m_Materials.ContainsKey(id))
continue;
OSDMap theMatMap = (OSDMap)matMap["Material"];
OSDMap theMatMap = (OSDMap)OSDMaterial;
FaceMaterial fmat = new FaceMaterial(theMatMap);
if(fmat == null ||
@@ -292,7 +292,7 @@ namespace OpenSim.Region.OptionalModules.Materials
&& fmat.NormalMapID == UUID.Zero
&& fmat.SpecularMapID == UUID.Zero))
continue;
fmat.ID = id;
m_Materials[id] = fmat;
m_MaterialsRefCount[id] = 0;
@@ -560,8 +560,7 @@ namespace OpenSim.Region.OptionalModules.Materials
uint primLocalID = 0;
try
{
tmpOSD = matsMap["ID"];
primLocalID = tmpOSD.AsUInteger();
primLocalID = matsMap["ID"].AsUInteger();
}
catch (Exception e)
{