diff options
author | UbitUmarov | 2017-07-07 04:57:57 +0100 |
---|---|---|
committer | UbitUmarov | 2017-07-07 04:57:57 +0100 |
commit | ead95e85c55e00abaac729109dfed47f10bc8c91 (patch) | |
tree | dd29f67328823510c46f8e686301127bebc1c62b | |
parent | ubOde don't use old ode body sleep option, a few changes on sleep control, up... (diff) | |
download | opensim-SC_OLD-ead95e85c55e00abaac729109dfed47f10bc8c91.zip opensim-SC_OLD-ead95e85c55e00abaac729109dfed47f10bc8c91.tar.gz opensim-SC_OLD-ead95e85c55e00abaac729109dfed47f10bc8c91.tar.bz2 opensim-SC_OLD-ead95e85c55e00abaac729109dfed47f10bc8c91.tar.xz |
bug fix: dynamic testures set to ALL_SIDES, preserve other face data already present
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
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 | |||
428 | // FIXME: Need to return the appropriate ID if only a single face is replaced. | 428 | // FIXME: Need to return the appropriate ID if only a single face is replaced. |
429 | oldID = tmptex.DefaultTexture.TextureID; | 429 | oldID = tmptex.DefaultTexture.TextureID; |
430 | 430 | ||
431 | // not using parts number of faces because that fails on old meshs | ||
431 | if (Face == ALL_SIDES) | 432 | if (Face == ALL_SIDES) |
432 | { | 433 | { |
433 | oldID = tmptex.DefaultTexture.TextureID; | 434 | oldID = tmptex.DefaultTexture.TextureID; |
434 | tmptex.DefaultTexture.TextureID = textureID; | 435 | tmptex.DefaultTexture.TextureID = textureID; |
435 | for(int i = 0; i < tmptex.FaceTextures.Length; i++) | 436 | for(int i = 0; i < tmptex.FaceTextures.Length; i++) |
436 | tmptex.FaceTextures[i] = null; | 437 | { |
438 | if(tmptex.FaceTextures[i] != null) | ||
439 | tmptex.FaceTextures[i].TextureID = textureID; | ||
440 | } | ||
437 | } | 441 | } |
438 | else | 442 | else |
439 | { | 443 | { |