aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMikko Pallari2010-08-10 14:57:22 +0300
committerMelanie2010-08-10 19:37:15 +0100
commit3f942a4f74057cb8280bbdd74f2c148b32792416 (patch)
treeb6ad1ead5ae1e39cf650b775389ae12088ab3cbd
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-3f942a4f74057cb8280bbdd74f2c148b32792416.zip
opensim-SC_OLD-3f942a4f74057cb8280bbdd74f2c148b32792416.tar.gz
opensim-SC_OLD-3f942a4f74057cb8280bbdd74f2c148b32792416.tar.bz2
opensim-SC_OLD-3f942a4f74057cb8280bbdd74f2c148b32792416.tar.xz
Removed abstract SetText method from EntityBase to make cleaner API.
Signed-off-by: Melanie <melanie@t-data.com>
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
3 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 4e25c46..e183f9d 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -130,8 +130,6 @@ namespace OpenSim.Region.Framework.Scenes
130 { 130 {
131 return (EntityBase) MemberwiseClone(); 131 return (EntityBase) MemberwiseClone();
132 } 132 }
133
134 public abstract void SetText(string text, Vector3 color, double alpha);
135 } 133 }
136 134
137 //Nested Classes 135 //Nested Classes
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6c1f3c2..3670080 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1360,7 +1360,7 @@ namespace OpenSim.Region.Framework.Scenes
1360 ScheduleGroupForFullUpdate(); 1360 ScheduleGroupForFullUpdate();
1361 } 1361 }
1362 1362
1363 public override void SetText(string text, Vector3 color, double alpha) 1363 public void SetText(string text, Vector3 color, double alpha)
1364 { 1364 {
1365 Color = Color.FromArgb(0xff - (int) (alpha * 0xff), 1365 Color = Color.FromArgb(0xff - (int) (alpha * 0xff),
1366 (int) (color.X * 0xff), 1366 (int) (color.X * 0xff),
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4c17615..14d7d6a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3212,11 +3212,6 @@ namespace OpenSim.Region.Framework.Scenes
3212 } 3212 }
3213 } 3213 }
3214 3214
3215 public override void SetText(string text, Vector3 color, double alpha)
3216 {
3217 throw new Exception("Can't set Text on avatar.");
3218 }
3219
3220 /// <summary> 3215 /// <summary>
3221 /// Adds a physical representation of the avatar to the Physics plugin 3216 /// Adds a physical representation of the avatar to the Physics plugin
3222 /// </summary> 3217 /// </summary>