diff options
| author | Jeff Ames | 2008-08-15 10:24:04 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-08-15 10:24:04 +0000 |
| commit | dde21314e75acdaeff27af70077f283493401961 (patch) | |
| tree | 490ab065895adb41ee4771fce623f99faa60b507 /OpenSim/Region/ScriptEngine | |
| parent | Fixes a case where, when inventory is not currently accessible due (diff) | |
| download | opensim-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')
3 files changed, 3 insertions, 3 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 |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 6c4f34a..825379d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -6662,7 +6662,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6662 | 6662 | ||
| 6663 | if (aList.Data[i] != null) | 6663 | if (aList.Data[i] != null) |
| 6664 | { | 6664 | { |
| 6665 | switch((ParcelMediaCommandEnum)aList.Data[i]) | 6665 | switch ((ParcelMediaCommandEnum) aList.Data[i]) |
| 6666 | { | 6666 | { |
| 6667 | case ParcelMediaCommandEnum.Url: | 6667 | case ParcelMediaCommandEnum.Url: |
| 6668 | list.Add(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL); | 6668 | list.Add(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL); |