aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2010-02-06 01:13:01 +0000
committerMelanie2010-02-06 01:13:01 +0000
commit4a092b5ab81c58853dbb03149e7bd924623044ee (patch)
tree38f2fb0fc5bbd81815ce83736f089fe9ae925274 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentFixing an incorrect logging message in insertUserRow (diff)
parentRevert "Old OpenSim installations may have no AssetCaching setting in config-... (diff)
downloadopensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.zip
opensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.gz
opensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.bz2
opensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-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 8d84557..dd797fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4144,9 +4144,13 @@ namespace OpenSim.Region.Framework.Scenes
4144 ScheduleFullUpdate(); 4144 ScheduleFullUpdate();
4145 } 4145 }
4146 4146
4147 // Added to handle bug in libsecondlife's TextureEntry.ToBytes() 4147 /// <summary>
4148 // not handling RGBA properly. Cycles through, and "fixes" the color 4148 /// Update the textures on the part.
4149 // info 4149 /// </summary>
4150 /// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
4151 /// not handling RGBA properly. Cycles through, and "fixes" the color
4152 /// info
4153 /// <param name="tex"></param>
4150 public void UpdateTexture(Primitive.TextureEntry tex) 4154 public void UpdateTexture(Primitive.TextureEntry tex)
4151 { 4155 {
4152 //Color4 tmpcolor; 4156 //Color4 tmpcolor;