aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorKitto Flora2010-02-12 14:08:32 -0500
committerKitto Flora2010-02-12 14:08:32 -0500
commit6a70349512a612948918db2f2f485e87b0bc87e6 (patch)
treebdbb11f3ec840c7a14402f0acdc302b04d5a0692 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentResolve a merge issue (diff)
downloadopensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.zip
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.gz
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.bz2
opensim-SC-6a70349512a612948918db2f2f485e87b0bc87e6.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 72604d8..11682d9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4171,9 +4171,13 @@ namespace OpenSim.Region.Framework.Scenes
4171 ScheduleFullUpdate(); 4171 ScheduleFullUpdate();
4172 } 4172 }
4173 4173
4174 // Added to handle bug in libsecondlife's TextureEntry.ToBytes() 4174 /// <summary>
4175 // not handling RGBA properly. Cycles through, and "fixes" the color 4175 /// Update the textures on the part.
4176 // info 4176 /// </summary>
4177 /// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
4178 /// not handling RGBA properly. Cycles through, and "fixes" the color
4179 /// info
4180 /// <param name="tex"></param>
4177 public void UpdateTexture(Primitive.TextureEntry tex) 4181 public void UpdateTexture(Primitive.TextureEntry tex)
4178 { 4182 {
4179 //Color4 tmpcolor; 4183 //Color4 tmpcolor;