From 7f3bfa277b894b90e660badf5ee47e4d99ef102c Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 16 Sep 2008 16:37:16 +0000 Subject: * minor: method documentation --- .../ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | 3 +++ OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 ++++-- .../ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 93a1a80..f331b5c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs @@ -149,6 +149,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } + /// + /// Main loop for the manager thread + /// private static void CmdHandlerThreadLoop() { while (true) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a5ff42d..d6c33f6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi { - // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); internal IScriptEngine m_ScriptEngine; internal SceneObjectPart m_host; @@ -7925,7 +7925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } public LSL_Types.LSLString llGetNotecardLine(string name, int line) - { + { m_host.AddScriptLPS(1); foreach (TaskInventoryItem item in m_host.TaskInventory.Values) @@ -7935,6 +7935,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID tid = AsyncCommands. DataserverPlugin.RegisterRequest(m_localID, m_itemID, item.AssetID.ToString()); + if (NotecardCache.IsCached(item.AssetID)) { AsyncCommands. @@ -7943,6 +7944,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // ScriptSleep(100); return tid.ToString(); } + WithNotecard(item.AssetID, delegate (UUID id, AssetBase a) { System.Text.ASCIIEncoding enc = diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs index 7300f10..9676cb3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs @@ -75,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins ds.startTime = DateTime.Now; - DataserverRequests[identifier]=ds; + DataserverRequests[identifier] = ds; return ds.ID; } @@ -90,7 +90,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins if (!DataserverRequests.ContainsKey(identifier)) return; - ds=DataserverRequests[identifier]; + ds = DataserverRequests[identifier]; DataserverRequests.Remove(identifier); } -- cgit v1.1