Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-02-08 22:11:38 +00:00
32 changed files with 2899 additions and 2727 deletions

View File

@@ -4171,9 +4171,13 @@ namespace OpenSim.Region.Framework.Scenes
ScheduleFullUpdate();
}
// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
// not handling RGBA properly. Cycles through, and "fixes" the color
// info
/// <summary>
/// Update the textures on the part.
/// </summary>
/// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
/// not handling RGBA properly. Cycles through, and "fixes" the color
/// info
/// <param name="tex"></param>
public void UpdateTexture(Primitive.TextureEntry tex)
{
//Color4 tmpcolor;