From ead95e85c55e00abaac729109dfed47f10bc8c91 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 7 Jul 2017 04:57:57 +0100
Subject: bug fix: dynamic testures set to ALL_SIDES, preserve other face data
 already present

---
 .../CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index c0b7ab5..090cb7d 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -428,12 +428,16 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     // FIXME: Need to return the appropriate ID if only a single face is replaced.
                     oldID = tmptex.DefaultTexture.TextureID;
 
+                    // not using parts number of faces because that fails on old meshs
                     if (Face == ALL_SIDES)
                     {
                         oldID = tmptex.DefaultTexture.TextureID;
                         tmptex.DefaultTexture.TextureID = textureID;
                         for(int i = 0; i < tmptex.FaceTextures.Length; i++)
-                            tmptex.FaceTextures[i] = null;
+                        {
+                            if(tmptex.FaceTextures[i] != null)
+                                tmptex.FaceTextures[i].TextureID = textureID;
+                        }
                     }
                     else
                     {
-- 
cgit v1.1