aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
-rwxr-xr-xbin/OpenMetaverse.dllbin2179072 -> 2179072 bytes
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a1296ba..312ce26 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -5130,7 +5130,7 @@ namespace OpenSim.Region.Framework.Scenes
5130 5130
5131 if (changeFlags == 0) 5131 if (changeFlags == 0)
5132 return; 5132 return;
5133 m_shape.TextureEntry = newTex.GetBytes(); 5133 m_shape.TextureEntry = newTex.GetBytes(9);
5134 TriggerScriptChangedEvent(changeFlags); 5134 TriggerScriptChangedEvent(changeFlags);
5135 ParentGroup.HasGroupChanged = true; 5135 ParentGroup.HasGroupChanged = true;
5136 ScheduleUpdate(PrimUpdateFlags.Textures); 5136 ScheduleUpdate(PrimUpdateFlags.Textures);
@@ -5159,7 +5159,7 @@ namespace OpenSim.Region.Framework.Scenes
5159 if (changeFlags == 0) 5159 if (changeFlags == 0)
5160 return; 5160 return;
5161 5161
5162 m_shape.TextureEntry = newTex.GetBytes(); 5162 m_shape.TextureEntry = newTex.GetBytes(9);
5163 TriggerScriptChangedEvent(changeFlags); 5163 TriggerScriptChangedEvent(changeFlags);
5164 ParentGroup.HasGroupChanged = true; 5164 ParentGroup.HasGroupChanged = true;
5165 ScheduleUpdate(PrimUpdateFlags.Textures); 5165 ScheduleUpdate(PrimUpdateFlags.Textures);
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)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 95d7a7a..ab3562f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10614,7 +10614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10614 return false; 10614 return false;
10615 10615
10616 texface.MaterialID = id; 10616 texface.MaterialID = id;
10617 part.Shape.TextureEntry = tex.GetBytes(); 10617 part.Shape.TextureEntry = tex.GetBytes(9);
10618 m_materialsModule.RemoveMaterial(oldid); 10618 m_materialsModule.RemoveMaterial(oldid);
10619 return true; 10619 return true;
10620 } 10620 }
@@ -10671,7 +10671,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10671 return false; 10671 return false;
10672 10672
10673 texface.MaterialID = id; 10673 texface.MaterialID = id;
10674 part.Shape.TextureEntry = tex.GetBytes(); 10674 part.Shape.TextureEntry = tex.GetBytes(9);
10675 m_materialsModule.RemoveMaterial(oldid); 10675 m_materialsModule.RemoveMaterial(oldid);
10676 return true; 10676 return true;
10677 } 10677 }
@@ -10738,7 +10738,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10738 return false; 10738 return false;
10739 10739
10740 texface.MaterialID = id; 10740 texface.MaterialID = id;
10741 part.Shape.TextureEntry = tex.GetBytes(); 10741 part.Shape.TextureEntry = tex.GetBytes(9);
10742 m_materialsModule.RemoveMaterial(oldid); 10742 m_materialsModule.RemoveMaterial(oldid);
10743 return true; 10743 return true;
10744 } 10744 }
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index b7ddd0b..02edd6c 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ