Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge

4 files changed, 67 insertions, 66 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index f2c8b3d..18bd018 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -355,7 +355,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                     // I'm pretty sure noone whats to set fullbright true if it wasn't true before.
                     // tmptex.DefaultTexture.Fullbright = true;
 
-                    part.UpdateTexture(tmptex);
+                    part.UpdateTextureEntry(tmptex.GetBytes());
                 }
 
                 if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
@@ -437,4 +437,4 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 3cc72fe..dbf29d0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3231,7 +3231,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="face"></param>
         public void SetFaceColor(Vector3 color, int face)
         {
-            Primitive.TextureEntry tex = Shape.Textures;
+            // The only way to get a deep copy/ If we don't do this, we can
+            // mever detect color changes further down.
+            Byte[] buf = Shape.Textures.GetBytes();
+            Primitive.TextureEntry tex = new Primitive.TextureEntry(buf, 0, buf.Length);
             Color4 texcolor;
             if (face >= 0 && face < GetNumberOfSides())
             {
@@ -3240,8 +3243,7 @@ namespace OpenSim.Region.Framework.Scenes
                 texcolor.G = Util.Clip((float)color.Y, 0.0f, 1.0f);
                 texcolor.B = Util.Clip((float)color.Z, 0.0f, 1.0f);
                 tex.FaceTextures[face].RGBA = texcolor;
-                UpdateTexture(tex);
-                TriggerScriptChangedEvent(Changed.COLOR);
+                UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             else if (face == ALL_SIDES)
@@ -3262,8 +3264,7 @@ namespace OpenSim.Region.Framework.Scenes
                     texcolor.B = Util.Clip((float)color.Z, 0.0f, 1.0f);
                     tex.DefaultTexture.RGBA = texcolor;
                 }
-                UpdateTexture(tex);
-                TriggerScriptChangedEvent(Changed.COLOR);
+                UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -4591,46 +4592,46 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Update the textures on the part.
-        /// </summary>
-        /// <remarks>
-        /// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
-        /// not handling RGBA properly. Cycles through, and "fixes" the color
-        /// info
-        /// </remarks>
-        /// <param name="tex"></param>
-        public void UpdateTexture(Primitive.TextureEntry tex)
-        {
-            //Color4 tmpcolor;
-            //for (uint i = 0; i < 32; i++)
-            //{
-            //    if (tex.FaceTextures[i] != null)
-            //    {
-            //        tmpcolor = tex.GetFace((uint) i).RGBA;
-            //        tmpcolor.A = tmpcolor.A*255;
-            //        tmpcolor.R = tmpcolor.R*255;
-            //        tmpcolor.G = tmpcolor.G*255;
-            //        tmpcolor.B = tmpcolor.B*255;
-            //        tex.FaceTextures[i].RGBA = tmpcolor;
-            //    }
-            //}
-            //tmpcolor = tex.DefaultTexture.RGBA;
-            //tmpcolor.A = tmpcolor.A*255;
-            //tmpcolor.R = tmpcolor.R*255;
-            //tmpcolor.G = tmpcolor.G*255;
-            //tmpcolor.B = tmpcolor.B*255;
-            //tex.DefaultTexture.RGBA = tmpcolor;
-            UpdateTextureEntry(tex.GetBytes());
-        }
-
-        /// <summary>
         /// Update the texture entry for this part.
         /// </summary>
         /// <param name="textureEntry"></param>
         public void UpdateTextureEntry(byte[] textureEntry)
         {
+            Primitive.TextureEntry newTex = new Primitive.TextureEntry(textureEntry, 0, textureEntry.Length);
+            Primitive.TextureEntry oldTex = Shape.Textures;
+
+            Changed changeFlags = 0;
+
+            for (int i = 0 ; i < GetNumberOfSides(); i++)
+            {
+                Primitive.TextureEntryFace newFace = newTex.DefaultTexture;
+                Primitive.TextureEntryFace oldFace = oldTex.DefaultTexture;
+
+                if (oldTex.FaceTextures[i] != null)
+                    oldFace = oldTex.FaceTextures[i];
+                if (newTex.FaceTextures[i] != null)
+                    newFace = newTex.FaceTextures[i];
+
+                Color4 oldRGBA = oldFace.RGBA;
+                Color4 newRGBA = newFace.RGBA;
+
+                if (oldRGBA.R != newRGBA.R ||
+                    oldRGBA.G != newRGBA.G ||
+                    oldRGBA.B != newRGBA.B ||
+                    oldRGBA.A != newRGBA.A)
+                    changeFlags |= Changed.COLOR;
+
+                if (oldFace.TextureID != newFace.TextureID)
+                    changeFlags |= Changed.TEXTURE;
+
+                // Max change, skip the rest of testing
+                if (changeFlags == (Changed.TEXTURE | Changed.COLOR))
+                    break;
+            }
+
             m_shape.TextureEntry = textureEntry;
-            TriggerScriptChangedEvent(Changed.TEXTURE);
+            if (changeFlags != 0)
+                TriggerScriptChangedEvent(changeFlags);
             UpdateFlag = UpdateRequired.FULL;
             ParentGroup.HasGroupChanged = true;
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
index 0cba6af..cea738c 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
                 texface.RGBA = new Color4(value.R,value.G,value.B,value.A);
                 tex.FaceTextures[m_face] = texface;
-                m_parent.UpdateTexture(tex);
+                m_parent.UpdateTextureEntry(tex.GetBytes());
             }
         }
 
@@ -72,7 +72,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
                 texface.TextureID = value;
                 tex.FaceTextures[m_face] = texface;
-                m_parent.UpdateTexture(tex);
+                m_parent.UpdateTextureEntry(tex.GetBytes());
             }
         }
 
@@ -97,7 +97,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
                 texface.Fullbright = value;
                 tex.FaceTextures[m_face] = texface;
-                m_parent.UpdateTexture(tex);
+                m_parent.UpdateTextureEntry(tex.GetBytes());
             }
         }
 
@@ -110,7 +110,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
                 texface.Glow = (float) value;
                 tex.FaceTextures[m_face] = texface;
-                m_parent.UpdateTexture(tex);
+                m_parent.UpdateTextureEntry(tex.GetBytes());
             }
         }
 
@@ -123,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
                 texface.Shiny = value ? Shininess.High : Shininess.None;
                 tex.FaceTextures[m_face] = texface;
-                m_parent.UpdateTexture(tex);
+                m_parent.UpdateTextureEntry(tex.GetBytes());
             }
         }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 461ee3e..d08712a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1540,7 +1540,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
                 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
                 tex.FaceTextures[face].RGBA = texcolor;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1561,7 +1561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
                     tex.DefaultTexture.RGBA = texcolor;
                 }
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
 
@@ -1586,7 +1586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 tex.CreateFace((uint) face);
                 tex.FaceTextures[face].TexMapType = textype;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1599,7 +1599,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                     tex.DefaultTexture.TexMapType = textype;
                 }
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -1614,7 +1614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 tex.CreateFace((uint) face);
                 tex.FaceTextures[face].Glow = glow;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1627,7 +1627,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                     tex.DefaultTexture.Glow = glow;
                 }
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -1664,7 +1664,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 tex.CreateFace((uint) face);
                 tex.FaceTextures[face].Shiny = sval;
                 tex.FaceTextures[face].Bump = bump;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1679,7 +1679,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     tex.DefaultTexture.Shiny = sval;
                     tex.DefaultTexture.Bump = bump;
                 }
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -1694,7 +1694,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
              {
                  tex.CreateFace((uint) face);
                  tex.FaceTextures[face].Fullbright = bright;
-                 part.UpdateTexture(tex);
+                 part.UpdateTextureEntry(tex.GetBytes());
                  return;
              }
              else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1707,7 +1707,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                      }
                  }
                  tex.DefaultTexture.Fullbright = bright;
-                 part.UpdateTexture(tex);
+                 part.UpdateTextureEntry(tex.GetBytes());
                  return;
              }
          }
@@ -1776,7 +1776,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 texcolor = tex.CreateFace((uint)face).RGBA;
                 texcolor.A = Util.Clip((float)alpha, 0.0f, 1.0f);
                 tex.FaceTextures[face].RGBA = texcolor;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1800,7 +1800,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     tex.DefaultTexture.RGBA = texcolor;
                 }
                 
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -1969,7 +1969,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 Primitive.TextureEntryFace texface = tex.CreateFace((uint)face);
                 texface.TextureID = textureID;
                 tex.FaceTextures[face] = texface;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1982,7 +1982,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
                 tex.DefaultTexture.TextureID = textureID;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -2007,7 +2007,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 texface.RepeatU = (float)u;
                 texface.RepeatV = (float)v;
                 tex.FaceTextures[face] = texface;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             if (face == ScriptBaseClass.ALL_SIDES)
@@ -2022,7 +2022,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
                 tex.DefaultTexture.RepeatU = (float)u;
                 tex.DefaultTexture.RepeatV = (float)v;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -2046,7 +2046,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 texface.OffsetU = (float)u;
                 texface.OffsetV = (float)v;
                 tex.FaceTextures[face] = texface;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             if (face == ScriptBaseClass.ALL_SIDES)
@@ -2061,7 +2061,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
                 tex.DefaultTexture.OffsetU = (float)u;
                 tex.DefaultTexture.OffsetV = (float)v;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }
@@ -2084,7 +2084,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 Primitive.TextureEntryFace texface = tex.CreateFace((uint)face);
                 texface.Rotation = (float)rotation;
                 tex.FaceTextures[face] = texface;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
             if (face == ScriptBaseClass.ALL_SIDES)
@@ -2097,7 +2097,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
                 tex.DefaultTexture.Rotation = (float)rotation;
-                part.UpdateTexture(tex);
+                part.UpdateTextureEntry(tex.GetBytes());
                 return;
             }
         }