diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 71c8018..2357c6b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3479,7 +3479,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3479 | /// <param name="alpha"></param> | 3479 | /// <param name="alpha"></param> |
3480 | public void SetText(string text, Vector3 color, double alpha) | 3480 | public void SetText(string text, Vector3 color, double alpha) |
3481 | { | 3481 | { |
3482 | Color = Color.FromArgb(0xff - (int) (alpha*0xff), | 3482 | Color = Color.FromArgb((int) (alpha*0xff), |
3483 | (int) (color.X*0xff), | 3483 | (int) (color.X*0xff), |
3484 | (int) (color.Y*0xff), | 3484 | (int) (color.Y*0xff), |
3485 | (int) (color.Z*0xff)); | 3485 | (int) (color.Z*0xff)); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ad7c3ae..3964b0b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1671,8 +1671,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1671 | /// </summary> | 1671 | /// </summary> |
1672 | public void StandUp() | 1672 | public void StandUp() |
1673 | { | 1673 | { |
1674 | if (SitGround) | 1674 | SitGround = false; |
1675 | SitGround = false; | ||
1676 | 1675 | ||
1677 | if (m_parentID != 0) | 1676 | if (m_parentID != 0) |
1678 | { | 1677 | { |