diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index b00d465..e2415b9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -37,6 +37,7 @@ using libsecondlife.Packets; | |||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Environment.Interfaces; | 38 | using OpenSim.Region.Environment.Interfaces; |
39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
40 | using System.Drawing; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.Environment.Scenes | 42 | namespace OpenSim.Region.Environment.Scenes |
42 | { | 43 | { |
@@ -166,6 +167,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
166 | get { return m_rootPart.OwnerID; } | 167 | get { return m_rootPart.OwnerID; } |
167 | } | 168 | } |
168 | 169 | ||
170 | public Color Color | ||
171 | { | ||
172 | get { return m_rootPart.Color; } | ||
173 | set { m_rootPart.Color = value; } | ||
174 | } | ||
175 | |||
169 | public string Text | 176 | public string Text |
170 | { | 177 | { |
171 | get { return m_rootPart.Text; } | 178 | get { return m_rootPart.Text; } |
@@ -1417,6 +1424,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1417 | 1424 | ||
1418 | public override void SetText(string text, Vector3 color, double alpha) | 1425 | public override void SetText(string text, Vector3 color, double alpha) |
1419 | { | 1426 | { |
1427 | Color = Color.FromArgb (0xff - (int)(alpha * 0xff), | ||
1428 | (int)(color.x * 0xff), | ||
1429 | (int)(color.y * 0xff), | ||
1430 | (int)(color.z * 0xff)); | ||
1420 | Text = text; | 1431 | Text = text; |
1421 | } | 1432 | } |
1422 | } | 1433 | } |