aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorlbsa712007-08-16 18:40:44 +0000
committerlbsa712007-08-16 18:40:44 +0000
commite53d680d4154ddd730f7b7d4779ab9a95de78fae (patch)
treebad9dee96fdb17ca675bbbc594dc877c67f3cea4 /OpenSim/Region/Environment
parentHad to rename Rotation in SceneObjectGroup to GroupRotation to stop conflict ... (diff)
downloadopensim-SC_OLD-e53d680d4154ddd730f7b7d4779ab9a95de78fae.zip
opensim-SC_OLD-e53d680d4154ddd730f7b7d4779ab9a95de78fae.tar.gz
opensim-SC_OLD-e53d680d4154ddd730f7b7d4779ab9a95de78fae.tar.bz2
opensim-SC_OLD-e53d680d4154ddd730f7b7d4779ab9a95de78fae.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive(Old).cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject(Old).cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs5
8 files changed, 33 insertions, 1 deletions
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
130 public virtual void LandRenegerated() 130 public virtual void LandRenegerated()
131 { 131 {
132 } 132 }
133 } 133
134 public abstract void SetText(string text, Vector3 color, double alpha);
135 }
134} \ No newline at end of file 136} \ 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
715 { 715 {
716 OnPrimCountTainted(); 716 OnPrimCountTainted();
717 } 717 }
718
719 public override void SetText(string text, Vector3 color, double alpha)
720 {
721 throw new Exception("The method or operation is not implemented.");
722 }
718 } 723 }
719} \ No newline at end of file 724} \ 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
311 client.OutPacket(proper); 311 client.OutPacket(proper);
312 } 312 }
313 313
314 public override void SetText(string text, Axiom.Math.Vector3 color, double alpha)
315 {
316 throw new System.Exception("The method or operation is not implemented.");
317 }
314 } 318 }
315} 319}
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
949 } 949 }
950 } 950 }
951 } 951 }
952
953 public override void SetText(string text, Vector3 color, double alpha)
954 {
955 Text = text;
956 }
952 } 957 }
953} 958}
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
576 public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient) 576 public virtual void OnGrab(LLVector3 offsetPos, IClientAPI remoteClient)
577 { 577 {
578 } 578 }
579
580 public void SetText(string text, Vector3 color, double alpha)
581 {
582 Text = text;
583 }
579 } 584 }
580} 585}
581 586
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
690 690
691 } 691 }
692 } 692 }
693
694 public override void SetText(string text, Vector3 color, double alpha)
695 {
696 throw new Exception("The method or operation is not implemented.");
697 }
693 } 698 }
694 699
695} 700}
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
10 string Name { get; } 10 string Name { get; }
11 LLUUID UUID { get; } 11 LLUUID UUID { get; }
12 LLVector3 AbsolutePosition { get; } 12 LLVector3 AbsolutePosition { get; }
13 void SetText(string text, Axiom.Math.Vector3 color, double alpha);
13 } 14 }
14} 15}
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
22 { 22 {
23 get { return m_pos; } 23 get { return m_pos; }
24 } 24 }
25
26 public void SetText(string text, Axiom.Math.Vector3 color, double alpha)
27 {
28 Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text);
29 }
25 } 30 }
26} 31}