diff options
| author | Melanie | 2010-05-24 23:40:22 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-24 23:40:22 +0100 |
| commit | 00737f1c13f66023264d30ec9ff51d842fd81ffa (patch) | |
| tree | a2b02542aa39a02b5f3c02463cea372ccabe792f /OpenSim/Region/Framework | |
| parent | Add the SitGround flag back in (diff) | |
| parent | Change the way alpha is interpreted on prim text. Manris #4723 (diff) | |
| download | opensim-SC-00737f1c13f66023264d30ec9ff51d842fd81ffa.zip opensim-SC-00737f1c13f66023264d30ec9ff51d842fd81ffa.tar.gz opensim-SC-00737f1c13f66023264d30ec9ff51d842fd81ffa.tar.bz2 opensim-SC-00737f1c13f66023264d30ec9ff51d842fd81ffa.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -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)); |