aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2011-03-31 21:14:53 -0700
committerdahlia2011-03-31 21:14:53 -0700
commit8c8a0a182e28f3486ce89fc0570b56fe53f69934 (patch)
treeae022eba1a67e648eeef88dd9d3fef7f90ef0f8b
parentWhen asked to join region to existing estate, make first estate name the defa... (diff)
downloadopensim-SC-8c8a0a182e28f3486ce89fc0570b56fe53f69934.zip
opensim-SC-8c8a0a182e28f3486ce89fc0570b56fe53f69934.tar.gz
opensim-SC-8c8a0a182e28f3486ce89fc0570b56fe53f69934.tar.bz2
opensim-SC-8c8a0a182e28f3486ce89fc0570b56fe53f69934.tar.xz
implement LSL "print()" API function
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs5
3 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 72ee495..e3e16bd 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
81 /// </summary> 81 /// </summary>
82 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi 82 public class LSL_Api : MarshalByRefObject, ILSL_Api, IScriptApi
83 { 83 {
84 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 84 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
85 protected IScriptEngine m_ScriptEngine; 85 protected IScriptEngine m_ScriptEngine;
86 protected SceneObjectPart m_host; 86 protected SceneObjectPart m_host;
87 protected uint m_localID; 87 protected uint m_localID;
@@ -10278,6 +10278,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10278 10278
10279 return GetLinkPrimitiveParams(obj, rules); 10279 return GetLinkPrimitiveParams(obj, rules);
10280 } 10280 }
10281
10282 public void print(string str)
10283 {
10284 // yes, this is a real LSL function. See: http://wiki.secondlife.com/wiki/Print
10285 m_log.Info("LSL print():" + str);
10286 }
10281 } 10287 }
10282 10288
10283 public class NotecardCache 10289 public class NotecardCache
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 561e3b3..bd6a094 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -398,6 +398,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
398 LSL_Vector llWind(LSL_Vector offset); 398 LSL_Vector llWind(LSL_Vector offset);
399 LSL_String llXorBase64Strings(string str1, string str2); 399 LSL_String llXorBase64Strings(string str1, string str2);
400 LSL_String llXorBase64StringsCorrect(string str1, string str2); 400 LSL_String llXorBase64StringsCorrect(string str1, string str2);
401 void print(string str);
401 402
402 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 403 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
403 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 404 LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 451163f..3b29861 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1847,5 +1847,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1847 { 1847 {
1848 return m_LSL_Functions.llClearPrimMedia(face); 1848 return m_LSL_Functions.llClearPrimMedia(face);
1849 } 1849 }
1850
1851 public void print(string str)
1852 {
1853 m_LSL_Functions.print(str);
1854 }
1850 } 1855 }
1851} 1856}