diff options
| author | Mike Rieker | 2010-05-27 21:31:10 -0400 |
|---|---|---|
| committer | Mike Rieker | 2010-05-27 21:31:10 -0400 |
| commit | 9ea42fdfab2ac99e24b386d67a08cf0024230f54 (patch) | |
| tree | fdefa445346d03ad2d73b62687ffae4e3b635ba9 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | fix hanging output throttle arithmetic (diff) | |
| parent | Prevent a null ref (diff) | |
| download | opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.zip opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.gz opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.bz2 opensim-SC-9ea42fdfab2ac99e24b386d67a08cf0024230f54.tar.xz | |
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index d174d04..683df93 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -3466,7 +3466,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3466 | /// <param name="alpha"></param> | 3466 | /// <param name="alpha"></param> |
| 3467 | public void SetText(string text, Vector3 color, double alpha) | 3467 | public void SetText(string text, Vector3 color, double alpha) |
| 3468 | { | 3468 | { |
| 3469 | Color = Color.FromArgb(0xff - (int) (alpha*0xff), | 3469 | Color = Color.FromArgb((int) (alpha*0xff), |
| 3470 | (int) (color.X*0xff), | 3470 | (int) (color.X*0xff), |
| 3471 | (int) (color.Y*0xff), | 3471 | (int) (color.Y*0xff), |
| 3472 | (int) (color.Z*0xff)); | 3472 | (int) (color.Z*0xff)); |