From e53d680d4154ddd730f7b7d4779ab9a95de78fae Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 16 Aug 2007 18:40:44 +0000 Subject: * Now sending manager, host and root host to Script in constructor. * Changed how Script accesses World * Implemented llSay, llWhisper and llShout * Added SetText() to IScriptHost, implemented llText * Minor renamings to conform with code conventions --- OpenSim/Region/Environment/Scenes/EntityBase.cs | 4 +++- OpenSim/Region/Environment/Scenes/Primitive(Old).cs | 5 +++++ OpenSim/Region/Environment/Scenes/SceneObject(Old).cs | 4 ++++ OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 5 +++++ OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 5 +++++ OpenSim/Region/Environment/Scenes/ScenePresence.cs | 5 +++++ OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs | 1 + OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs | 5 +++++ 8 files changed, 33 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index a4d9ac5..6d933e6 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs @@ -130,5 +130,7 @@ namespace OpenSim.Region.Environment.Scenes public virtual void LandRenegerated() { } - } + + public abstract void SetText(string text, Vector3 color, double alpha); + } } \ No newline at end of file diff --git a/OpenSim/Region/Environment/Scenes/Primitive(Old).cs b/OpenSim/Region/Environment/Scenes/Primitive(Old).cs index 2f51ab3..0efa570 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive(Old).cs +++ b/OpenSim/Region/Environment/Scenes/Primitive(Old).cs @@ -715,5 +715,10 @@ namespace OpenSim.Region.Environment.Scenes { OnPrimCountTainted(); } + + public override void SetText(string text, Vector3 color, double alpha) + { + throw new Exception("The method or operation is not implemented."); + } } } \ No newline at end of file diff --git a/OpenSim/Region/Environment/Scenes/SceneObject(Old).cs b/OpenSim/Region/Environment/Scenes/SceneObject(Old).cs index f32c952..6f06b5a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObject(Old).cs +++ b/OpenSim/Region/Environment/Scenes/SceneObject(Old).cs @@ -311,5 +311,9 @@ namespace OpenSim.Region.Environment.Scenes client.OutPacket(proper); } + public override void SetText(string text, Axiom.Math.Vector3 color, double alpha) + { + throw new System.Exception("The method or operation is not implemented."); + } } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index ec62509..421a981 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -949,5 +949,10 @@ namespace OpenSim.Region.Environment.Scenes } } } + + public override void SetText(string text, Vector3 color, double alpha) + { + Text = text; + } } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 54bb5e6..8da7923 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -576,6 +576,11 @@ namespace OpenSim.Region.Environment.Scenes public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient) { } + + public void SetText(string text, Vector3 color, double alpha) + { + Text = text; + } } } diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 5dbf643..7dcb760 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -690,6 +690,11 @@ namespace OpenSim.Region.Environment.Scenes } } + + public override void SetText(string text, Vector3 color, double alpha) + { + throw new Exception("The method or operation is not implemented."); + } } } diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs index 1c14264..5d5f698 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs @@ -10,5 +10,6 @@ namespace OpenSim.Region.Environment.Scenes.Scripting string Name { get; } LLUUID UUID { get; } LLVector3 AbsolutePosition { get; } + void SetText(string text, Axiom.Math.Vector3 color, double alpha); } } diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs index a55c87e..03587de 100644 --- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs @@ -22,5 +22,10 @@ namespace OpenSim.Region.Environment.Scenes.Scripting { get { return m_pos; } } + + public void SetText(string text, Axiom.Math.Vector3 color, double alpha) + { + Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text); + } } } -- cgit v1.1