Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-24 23:40:22 +01:00
3 changed files with 5 additions and 4 deletions

View File

@@ -3466,7 +3466,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="alpha"></param>
public void SetText(string text, Vector3 color, double alpha)
{
Color = Color.FromArgb(0xff - (int) (alpha*0xff),
Color = Color.FromArgb((int) (alpha*0xff),
(int) (color.X*0xff),
(int) (color.Y*0xff),
(int) (color.Z*0xff));