From 9924f35613e7cbb1a30316c032f16e69234d9983 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 6 Aug 2007 13:21:30 +0000 Subject: * encapsulated firstname/lastname on ScenePresence * fixed 'users' console command * minor refactorings --- .../Environment/Scenes/Scripting/ScriptInterpretedAPI.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/Scripting/ScriptInterpretedAPI.cs') 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; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.LandManagement; +using libsecondlife; namespace OpenSim.Region.Scripting { @@ -17,13 +18,13 @@ namespace OpenSim.Region.Scripting /// Avoid at all costs. This should ONLY be used for LSL. class ScriptInterpretedAPI { - protected libsecondlife.LLUUID m_object; + protected LLUUID m_object; protected Scene m_scene; /// /// The scene in which this script is acting /// - public Scene World + public Scene Scene { get { return m_scene; } } @@ -41,7 +42,7 @@ namespace OpenSim.Region.Scripting /// public SceneObject Task { - get { return World.Objects[ObjectID]; } + get { return Scene.Objects[ObjectID]; } } /// @@ -74,7 +75,7 @@ namespace OpenSim.Region.Scripting public void osAddToLandPassList(Key avatar, float hours) { Vector myPosition = Task.Pos; - Land myParcel = World.LandManager.getLandObject(myPosition.X, myPosition.Y); + Land myParcel = Scene.LandManager.getLandObject(myPosition.X, myPosition.Y); OpenSim.Framework.Console.MainLog.Instance.Warn("script", "Unimplemented function called by script: osAddToLandPassList(Key avatar, float hours)"); return; @@ -228,8 +229,8 @@ namespace OpenSim.Region.Scripting public void osCreateLink(Key target, int parent) { - if(World.Entities[target] is SceneObject) - Task.AddNewChildPrims((SceneObject)World.Entities[target]); + if(Scene.Entities[target] is SceneObject) + Task.AddNewChildPrims((SceneObject)Scene.Entities[target]); return; } -- cgit v1.1