aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs4
3 files changed, 9 insertions, 4 deletions
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
149 } 149 }
150 } 150 }
151 151
152 /// <summary>
153 /// Main loop for the manager thread
154 /// </summary>
152 private static void CmdHandlerThreadLoop() 155 private static void CmdHandlerThreadLoop()
153 { 156 {
154 while (true) 157 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
57 /// </summary> 57 /// </summary>
58 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 58 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
59 { 59 {
60 // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 60 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
61 61
62 internal IScriptEngine m_ScriptEngine; 62 internal IScriptEngine m_ScriptEngine;
63 internal SceneObjectPart m_host; 63 internal SceneObjectPart m_host;
@@ -7925,7 +7925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7925 } 7925 }
7926 7926
7927 public LSL_Types.LSLString llGetNotecardLine(string name, int line) 7927 public LSL_Types.LSLString llGetNotecardLine(string name, int line)
7928 { 7928 {
7929 m_host.AddScriptLPS(1); 7929 m_host.AddScriptLPS(1);
7930 7930
7931 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 7931 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
@@ -7935,6 +7935,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7935 UUID tid = AsyncCommands. 7935 UUID tid = AsyncCommands.
7936 DataserverPlugin.RegisterRequest(m_localID, 7936 DataserverPlugin.RegisterRequest(m_localID,
7937 m_itemID, item.AssetID.ToString()); 7937 m_itemID, item.AssetID.ToString());
7938
7938 if (NotecardCache.IsCached(item.AssetID)) 7939 if (NotecardCache.IsCached(item.AssetID))
7939 { 7940 {
7940 AsyncCommands. 7941 AsyncCommands.
@@ -7943,6 +7944,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7943 // ScriptSleep(100); 7944 // ScriptSleep(100);
7944 return tid.ToString(); 7945 return tid.ToString();
7945 } 7946 }
7947
7946 WithNotecard(item.AssetID, delegate (UUID id, AssetBase a) 7948 WithNotecard(item.AssetID, delegate (UUID id, AssetBase a)
7947 { 7949 {
7948 System.Text.ASCIIEncoding enc = 7950 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
75 75
76 ds.startTime = DateTime.Now; 76 ds.startTime = DateTime.Now;
77 77
78 DataserverRequests[identifier]=ds; 78 DataserverRequests[identifier] = ds;
79 79
80 return ds.ID; 80 return ds.ID;
81 } 81 }
@@ -90,7 +90,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
90 if (!DataserverRequests.ContainsKey(identifier)) 90 if (!DataserverRequests.ContainsKey(identifier))
91 return; 91 return;
92 92
93 ds=DataserverRequests[identifier]; 93 ds = DataserverRequests[identifier];
94 DataserverRequests.Remove(identifier); 94 DataserverRequests.Remove(identifier);
95 } 95 }
96 96