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

prims have at most 9 face textures

0.9.1.0-post-fixes
UbitUmarov 2019-03-07 12:12:11 +00:00
parent 6ae1341c58
commit fbd741ece3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -5130,7 +5130,7 @@ namespace OpenSim.Region.Framework.Scenes
if (changeFlags == 0) if (changeFlags == 0)
return; return;
m_shape.TextureEntry = newTex.GetBytes(); m_shape.TextureEntry = newTex.GetBytes(9);
TriggerScriptChangedEvent(changeFlags); TriggerScriptChangedEvent(changeFlags);
ParentGroup.HasGroupChanged = true; ParentGroup.HasGroupChanged = true;
ScheduleUpdate(PrimUpdateFlags.Textures); ScheduleUpdate(PrimUpdateFlags.Textures);
@ -5159,7 +5159,7 @@ namespace OpenSim.Region.Framework.Scenes
if (changeFlags == 0) if (changeFlags == 0)
return; return;
m_shape.TextureEntry = newTex.GetBytes(); m_shape.TextureEntry = newTex.GetBytes(9);
TriggerScriptChangedEvent(changeFlags); TriggerScriptChangedEvent(changeFlags);
ParentGroup.HasGroupChanged = true; ParentGroup.HasGroupChanged = true;
ScheduleUpdate(PrimUpdateFlags.Textures); ScheduleUpdate(PrimUpdateFlags.Textures);

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

@ -323,7 +323,7 @@ namespace OpenSim.Region.OptionalModules.Materials
} }
if(facechanged) if(facechanged)
part.Shape.TextureEntry = te.GetBytes(); part.Shape.TextureEntry = te.GetBytes(9);
if(facechanged || partchanged) if(facechanged || partchanged)
{ {
@ -632,7 +632,7 @@ namespace OpenSim.Region.OptionalModules.Materials
faceEntry.MaterialID = id; faceEntry.MaterialID = id;
//m_log.DebugFormat("[Materials]: in \"{0}\" {1}, setting material ID for face {2} to {3}", sop.Name, sop.UUID, face, id); //m_log.DebugFormat("[Materials]: in \"{0}\" {1}, setting material ID for face {2} to {3}", sop.Name, sop.UUID, face, id);
// We can't use sop.UpdateTextureEntry(te) because it filters, so do it manually // We can't use sop.UpdateTextureEntry(te) because it filters, so do it manually
sop.Shape.TextureEntry = te.GetBytes(); sop.Shape.TextureEntry = te.GetBytes(9);
} }
if(oldid != UUID.Zero) if(oldid != UUID.Zero)

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -10614,7 +10614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return false; return false;
texface.MaterialID = id; texface.MaterialID = id;
part.Shape.TextureEntry = tex.GetBytes(); part.Shape.TextureEntry = tex.GetBytes(9);
m_materialsModule.RemoveMaterial(oldid); m_materialsModule.RemoveMaterial(oldid);
return true; return true;
} }
@ -10671,7 +10671,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return false; return false;
texface.MaterialID = id; texface.MaterialID = id;
part.Shape.TextureEntry = tex.GetBytes(); part.Shape.TextureEntry = tex.GetBytes(9);
m_materialsModule.RemoveMaterial(oldid); m_materialsModule.RemoveMaterial(oldid);
return true; return true;
} }
@ -10738,7 +10738,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return false; return false;
texface.MaterialID = id; texface.MaterialID = id;
part.Shape.TextureEntry = tex.GetBytes(); part.Shape.TextureEntry = tex.GetBytes(9);
m_materialsModule.RemoveMaterial(oldid); m_materialsModule.RemoveMaterial(oldid);
return true; return true;
} }

BIN
bin/OpenMetaverse.dll
View File

Binary file not shown.