aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorDalien Talbot2007-11-11 22:23:34 +0000
committerDalien Talbot2007-11-11 22:23:34 +0000
commit8039c31e88fff3fb5edb57ebaa164d3d20e4b939 (patch)
tree43112538aa9f1873a4b294a1854b55c1c675af20 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentFixing null pointer exception from Mathias Soeken: (diff)
downloadopensim-SC_OLD-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.zip
opensim-SC_OLD-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.tar.gz
opensim-SC_OLD-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.tar.bz2
opensim-SC_OLD-8039c31e88fff3fb5edb57ebaa164d3d20e4b939.tar.xz
Patch from Mathias Soeken (thanks Mathias!) to take care of the color
and alpha argument of the llSetText command.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs11
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;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
40using System.Drawing;
40 41
41namespace OpenSim.Region.Environment.Scenes 42namespace 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 }