aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scripting
diff options
context:
space:
mode:
authorlbsa712007-08-06 13:21:30 +0000
committerlbsa712007-08-06 13:21:30 +0000
commit9924f35613e7cbb1a30316c032f16e69234d9983 (patch)
tree0d1759cb609449e75f986be3b2c650777092cec9 /OpenSim/Region/Environment/Scenes/Scripting
parent* minor refactorings (diff)
downloadopensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.zip
opensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.tar.gz
opensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.tar.bz2
opensim-SC_OLD-9924f35613e7cbb1a30316c032f16e69234d9983.tar.xz
* encapsulated firstname/lastname on ScenePresence
* fixed 'users' console command * minor refactorings
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scripting')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScript.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/Script.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs13
3 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScript.cs b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScript.cs
index 6eca69a..71d4c7e 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScript.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/Engines/LSLEngine/LSLScript.cs
@@ -10,7 +10,7 @@ namespace OpenSim.Region.Scripting.LSL
10 class LSLScript : IScript 10 class LSLScript : IScript
11 { 11 {
12 ScriptInfo scriptInfo; 12 ScriptInfo scriptInfo;
13 LSL.Engine lindenScriptEngine; 13 Engine lindenScriptEngine;
14 14
15 public LSLScript(string filename, libsecondlife.LLUUID taskObject) 15 public LSLScript(string filename, libsecondlife.LLUUID taskObject)
16 { 16 {
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/Script.cs b/OpenSim/Region/Environment/Scenes/Scripting/Script.cs
index fa4bdde..e1e1d87 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/Script.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Scripting
53 53
54 void events_OnNewPresence(ScenePresence presence) 54 void events_OnNewPresence(ScenePresence presence)
55 { 55 {
56 script.logger.Verbose("Hello " + presence.firstname.ToString() + "!"); 56 script.logger.Verbose("Hello " + presence.Firstname.ToString() + "!");
57 } 57 }
58 58
59 void events_OnFrame() 59 void events_OnFrame()
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs
index 284ae74..af8a29f 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs
@@ -8,6 +8,7 @@ using LSLList = System.Collections.Generic.List<string>;
8 8
9using OpenSim.Region.Environment.Scenes; 9using OpenSim.Region.Environment.Scenes;
10using OpenSim.Region.Environment.LandManagement; 10using OpenSim.Region.Environment.LandManagement;
11using libsecondlife;
11 12
12namespace OpenSim.Region.Scripting 13namespace OpenSim.Region.Scripting
13{ 14{
@@ -17,13 +18,13 @@ namespace OpenSim.Region.Scripting
17 /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks> 18 /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks>
18 class ScriptInterpretedAPI 19 class ScriptInterpretedAPI
19 { 20 {
20 protected libsecondlife.LLUUID m_object; 21 protected LLUUID m_object;
21 protected Scene m_scene; 22 protected Scene m_scene;
22 23
23 /// <summary> 24 /// <summary>
24 /// The scene in which this script is acting 25 /// The scene in which this script is acting
25 /// </summary> 26 /// </summary>
26 public Scene World 27 public Scene Scene
27 { 28 {
28 get { return m_scene; } 29 get { return m_scene; }
29 } 30 }
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Scripting
41 /// </summary> 42 /// </summary>
42 public SceneObject Task 43 public SceneObject Task
43 { 44 {
44 get { return World.Objects[ObjectID]; } 45 get { return Scene.Objects[ObjectID]; }
45 } 46 }
46 47
47 /// <summary> 48 /// <summary>
@@ -74,7 +75,7 @@ namespace OpenSim.Region.Scripting
74 public void osAddToLandPassList(Key avatar, float hours) 75 public void osAddToLandPassList(Key avatar, float hours)
75 { 76 {
76 Vector myPosition = Task.Pos; 77 Vector myPosition = Task.Pos;
77 Land myParcel = World.LandManager.getLandObject(myPosition.X, myPosition.Y); 78 Land myParcel = Scene.LandManager.getLandObject(myPosition.X, myPosition.Y);
78 79
79 OpenSim.Framework.Console.MainLog.Instance.Warn("script", "Unimplemented function called by script: osAddToLandPassList(Key avatar, float hours)"); 80 OpenSim.Framework.Console.MainLog.Instance.Warn("script", "Unimplemented function called by script: osAddToLandPassList(Key avatar, float hours)");
80 return; 81 return;
@@ -228,8 +229,8 @@ namespace OpenSim.Region.Scripting
228 229
229 public void osCreateLink(Key target, int parent) 230 public void osCreateLink(Key target, int parent)
230 { 231 {
231 if(World.Entities[target] is SceneObject) 232 if(Scene.Entities[target] is SceneObject)
232 Task.AddNewChildPrims((SceneObject)World.Entities[target]); 233 Task.AddNewChildPrims((SceneObject)Scene.Entities[target]);
233 234
234 return; 235 return;
235 } 236 }