aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2013-04-17 22:41:12 -0700
committerdahlia2013-04-17 22:41:12 -0700
commitce043c5141dde0ffed39d548bf680885a73e2908 (patch)
tree4445c3a42cfd4641d4c1224a3ad93b42bac1dd9f
parentupdate libomv to git master which adds support for MaterialID in TextureEntry (diff)
downloadopensim-SC_OLD-ce043c5141dde0ffed39d548bf680885a73e2908.zip
opensim-SC_OLD-ce043c5141dde0ffed39d548bf680885a73e2908.tar.gz
opensim-SC_OLD-ce043c5141dde0ffed39d548bf680885a73e2908.tar.bz2
opensim-SC_OLD-ce043c5141dde0ffed39d548bf680885a73e2908.tar.xz
Allow changes to TextureEntry to propagate to viewers when MaterialID changes
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 93d4da0..0e85b87 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4571,6 +4571,8 @@ namespace OpenSim.Region.Framework.Scenes
4571 4571
4572 if (oldFace.TextureID != newFace.TextureID) 4572 if (oldFace.TextureID != newFace.TextureID)
4573 changeFlags |= Changed.TEXTURE; 4573 changeFlags |= Changed.TEXTURE;
4574 if (oldFace.MaterialID != newFace.MaterialID)
4575 changeFlags |= Changed.TEXTURE;
4574 4576
4575 // Max change, skip the rest of testing 4577 // Max change, skip the rest of testing
4576 if (changeFlags == (Changed.TEXTURE | Changed.COLOR)) 4578 if (changeFlags == (Changed.TEXTURE | Changed.COLOR))