diff options
author | root | 2019-03-11 23:41:26 +0000 |
---|---|---|
committer | root | 2019-03-11 23:41:26 +0000 |
commit | c7a02dc058018429fca8fb0c979785be34bebaf6 (patch) | |
tree | a364249657222c201c9880ec355dafbcb7f99d9a /OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |
parent | Should have been in the last commit (diff) | |
parent | errr use invariantculture compare not current (diff) | |
download | opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.zip opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.gz opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.bz2 opensim-SC-c7a02dc058018429fca8fb0c979785be34bebaf6.tar.xz |
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index 516f9eb..822439f 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | |||
@@ -323,7 +323,7 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
323 | } | 323 | } |
324 | 324 | ||
325 | if(facechanged) | 325 | if(facechanged) |
326 | part.Shape.TextureEntry = te.GetBytes(); | 326 | part.Shape.TextureEntry = te.GetBytes(9); |
327 | 327 | ||
328 | if(facechanged || partchanged) | 328 | if(facechanged || partchanged) |
329 | { | 329 | { |
@@ -632,7 +632,7 @@ namespace OpenSim.Region.OptionalModules.Materials | |||
632 | faceEntry.MaterialID = id; | 632 | faceEntry.MaterialID = id; |
633 | //m_log.DebugFormat("[Materials]: in \"{0}\" {1}, setting material ID for face {2} to {3}", sop.Name, sop.UUID, face, id); | 633 | //m_log.DebugFormat("[Materials]: in \"{0}\" {1}, setting material ID for face {2} to {3}", sop.Name, sop.UUID, face, id); |
634 | // We can't use sop.UpdateTextureEntry(te) because it filters, so do it manually | 634 | // We can't use sop.UpdateTextureEntry(te) because it filters, so do it manually |
635 | sop.Shape.TextureEntry = te.GetBytes(); | 635 | sop.Shape.TextureEntry = te.GetBytes(9); |
636 | } | 636 | } |
637 | 637 | ||
638 | if(oldid != UUID.Zero) | 638 | if(oldid != UUID.Zero) |