diff options
author | Melanie | 2010-03-06 12:37:24 +0000 |
---|---|---|
committer | Melanie | 2010-03-06 12:37:24 +0000 |
commit | 8180c72cbc9cafff247d614ac14db29499fc32a9 (patch) | |
tree | fd92204394e657b805e094a237ffecaf50066df6 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-8180c72cbc9cafff247d614ac14db29499fc32a9.zip opensim-SC-8180c72cbc9cafff247d614ac14db29499fc32a9.tar.gz opensim-SC-8180c72cbc9cafff247d614ac14db29499fc32a9.tar.bz2 opensim-SC-8180c72cbc9cafff247d614ac14db29499fc32a9.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index badf782..e0d0fe1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4732,5 +4732,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
4732 | m_log.Error("[Physics] " + ex); | 4732 | m_log.Error("[Physics] " + ex); |
4733 | } | 4733 | } |
4734 | } | 4734 | } |
4735 | |||
4736 | public Color4 GetTextColor() | ||
4737 | { | ||
4738 | return new Color4((byte)Color.R, (byte)Color.G, (byte)Color.B, (byte)(0xFF - Color.A)); | ||
4739 | } | ||
4735 | } | 4740 | } |
4736 | } | 4741 | } |