diff options
| author | dahlia | 2013-04-17 22:41:12 -0700 |
|---|---|---|
| committer | dahlia | 2013-04-17 22:41:12 -0700 |
| commit | ce043c5141dde0ffed39d548bf680885a73e2908 (patch) | |
| tree | 4445c3a42cfd4641d4c1224a3ad93b42bac1dd9f /OpenSim/Region/Framework/Scenes | |
| parent | update libomv to git master which adds support for MaterialID in TextureEntry (diff) | |
| download | opensim-SC-ce043c5141dde0ffed39d548bf680885a73e2908.zip opensim-SC-ce043c5141dde0ffed39d548bf680885a73e2908.tar.gz opensim-SC-ce043c5141dde0ffed39d548bf680885a73e2908.tar.bz2 opensim-SC-ce043c5141dde0ffed39d548bf680885a73e2908.tar.xz | |
Allow changes to TextureEntry to propagate to viewers when MaterialID changes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
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)) |