From 3f942a4f74057cb8280bbdd74f2c148b32792416 Mon Sep 17 00:00:00 2001
From: Mikko Pallari
Date: Tue, 10 Aug 2010 14:57:22 +0300
Subject: Removed abstract SetText method from EntityBase to make cleaner API.
Signed-off-by: Melanie <melanie@t-data.com>
---
OpenSim/Region/Framework/Scenes/EntityBase.cs | 2 --
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 -----
3 files changed, 1 insertion(+), 8 deletions(-)
(limited to 'OpenSim/Region')
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
{
return (EntityBase) MemberwiseClone();
}
-
- public abstract void SetText(string text, Vector3 color, double alpha);
}
//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
ScheduleGroupForFullUpdate();
}
- public override void SetText(string text, Vector3 color, double alpha)
+ public void SetText(string text, Vector3 color, double alpha)
{
Color = Color.FromArgb(0xff - (int) (alpha * 0xff),
(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
}
}
- public override void SetText(string text, Vector3 color, double alpha)
- {
- throw new Exception("Can't set Text on avatar.");
- }
-
/// <summary>
/// Adds a physical representation of the avatar to the Physics plugin
/// </summary>
--
cgit v1.1