Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-03-06 12:37:24 +00:00
34 changed files with 1259 additions and 428 deletions

View File

@@ -4732,5 +4732,10 @@ namespace OpenSim.Region.Framework.Scenes
m_log.Error("[Physics] " + ex);
}
}
public Color4 GetTextColor()
{
return new Color4((byte)Color.R, (byte)Color.G, (byte)Color.B, (byte)(0xFF - Color.A));
}
}
}