aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorJeff Ames2008-08-15 10:24:04 +0000
committerJeff Ames2008-08-15 10:24:04 +0000
commitdde21314e75acdaeff27af70077f283493401961 (patch)
tree490ab065895adb41ee4771fce623f99faa60b507 /OpenSim/Region/ScriptEngine/Common
parentFixes a case where, when inventory is not currently accessible due (diff)
downloadopensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.zip
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.gz
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.bz2
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.xz
Update svn properties, formatting cleanup, fix a couple compiler warnings.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index e1a4648..f6cc7f0 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -6907,7 +6907,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6907 6907
6908 if (aList.Data[i] != null) 6908 if (aList.Data[i] != null)
6909 { 6909 {
6910 switch((ParcelMediaCommandEnum)aList.Data[i]) 6910 switch ((ParcelMediaCommandEnum) aList.Data[i])
6911 { 6911 {
6912 case ParcelMediaCommandEnum.Url: 6912 case ParcelMediaCommandEnum.Url:
6913 list.Add(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL); 6913 list.Add(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL);
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index 7dfac62..255ab99 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
43 /// </summary> 43 /// </summary>
44 public class EventQueueThreadClass : iScriptEngineFunctionModule 44 public class EventQueueThreadClass : iScriptEngineFunctionModule
45 { 45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 46 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 47
48 /// <summary> 48 /// <summary>
49 /// How many ms to sleep if queue is empty 49 /// How many ms to sleep if queue is empty