diff options
author | Melanie | 2011-12-05 18:54:31 +0000 |
---|---|---|
committer | Melanie | 2011-12-05 18:54:31 +0000 |
commit | cc482ee865efb06c05f5bd25943fdab30c0170a7 (patch) | |
tree | cc1bee262b25bf10c0ccbb50512d09ec8efec432 /OpenSim/Region/OptionalModules | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | Fix CHANGED_TEXTURE and CHANGED_COLOR. (diff) | |
download | opensim-SC-cc482ee865efb06c05f5bd25943fdab30c0170a7.zip opensim-SC-cc482ee865efb06c05f5bd25943fdab30c0170a7.tar.gz opensim-SC-cc482ee865efb06c05f5bd25943fdab30c0170a7.tar.bz2 opensim-SC-cc482ee865efb06c05f5bd25943fdab30c0170a7.tar.xz |
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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 | |||
55 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); | 55 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); |
56 | texface.RGBA = new Color4(value.R,value.G,value.B,value.A); | 56 | texface.RGBA = new Color4(value.R,value.G,value.B,value.A); |
57 | tex.FaceTextures[m_face] = texface; | 57 | tex.FaceTextures[m_face] = texface; |
58 | m_parent.UpdateTexture(tex); | 58 | m_parent.UpdateTextureEntry(tex.GetBytes()); |
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
72 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); | 72 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); |
73 | texface.TextureID = value; | 73 | texface.TextureID = value; |
74 | tex.FaceTextures[m_face] = texface; | 74 | tex.FaceTextures[m_face] = texface; |
75 | m_parent.UpdateTexture(tex); | 75 | m_parent.UpdateTextureEntry(tex.GetBytes()); |
76 | } | 76 | } |
77 | } | 77 | } |
78 | 78 | ||
@@ -97,7 +97,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
97 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); | 97 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); |
98 | texface.Fullbright = value; | 98 | texface.Fullbright = value; |
99 | tex.FaceTextures[m_face] = texface; | 99 | tex.FaceTextures[m_face] = texface; |
100 | m_parent.UpdateTexture(tex); | 100 | m_parent.UpdateTextureEntry(tex.GetBytes()); |
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
@@ -110,7 +110,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
110 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); | 110 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); |
111 | texface.Glow = (float) value; | 111 | texface.Glow = (float) value; |
112 | tex.FaceTextures[m_face] = texface; | 112 | tex.FaceTextures[m_face] = texface; |
113 | m_parent.UpdateTexture(tex); | 113 | m_parent.UpdateTextureEntry(tex.GetBytes()); |
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||
@@ -123,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
123 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); | 123 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face); |
124 | texface.Shiny = value ? Shininess.High : Shininess.None; | 124 | texface.Shiny = value ? Shininess.High : Shininess.None; |
125 | tex.FaceTextures[m_face] = texface; | 125 | tex.FaceTextures[m_face] = texface; |
126 | m_parent.UpdateTexture(tex); | 126 | m_parent.UpdateTextureEntry(tex.GetBytes()); |
127 | } | 127 | } |
128 | } | 128 | } |
129 | 129 | ||