diff options
author | Jeff Ames | 2008-02-20 18:38:20 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-20 18:38:20 +0000 |
commit | a8cfbbe963529728acbab4d9936cb89af380d1ac (patch) | |
tree | 16a72fba3d15556f6702127e7cfb98aa9fb9cf81 /OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs | |
parent | Fix exception when reading OpenSim.ini file. (diff) | |
download | opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.zip opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.gz opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.bz2 opensim-SC_OLD-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.xz |
Minor cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs index 60a1cb3..870884c 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs | |||
@@ -13,7 +13,7 @@ | |||
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
48 | // Security note: This script will be running inside an restricted AppDomain. Currently AppDomain is not very restricted. | 48 | // Security note: This script will be running inside an restricted AppDomain. Currently AppDomain is not very restricted. |
49 | // | 49 | // |
50 | 50 | ||
51 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 51 | //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | // Object never expires | 53 | // Object never expires |
54 | public override Object InitializeLifetimeService() | 54 | public override Object InitializeLifetimeService() |
@@ -1865,17 +1865,16 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1865 | m_LSL_Functions.osRegionNotice(msg); | 1865 | m_LSL_Functions.osRegionNotice(msg); |
1866 | } | 1866 | } |
1867 | 1867 | ||
1868 | public bool osConsoleCommand(string Command) | 1868 | public bool osConsoleCommand(string Command) |
1869 | { | 1869 | { |
1870 | return m_LSL_Functions.osConsoleCommand(Command); | 1870 | return m_LSL_Functions.osConsoleCommand(Command); |
1871 | } | 1871 | } |
1872 | 1872 | ||
1873 | public double llList2Float(LSL_Types.list src, int index) | 1873 | public double llList2Float(LSL_Types.list src, int index) |
1874 | { | 1874 | { |
1875 | return m_LSL_Functions.llList2Float(src, index); | 1875 | return m_LSL_Functions.llList2Float(src, index); |
1876 | } | 1876 | } |
1877 | 1877 | ||
1878 | |||
1879 | // LSL CONSTANTS | 1878 | // LSL CONSTANTS |
1880 | public const int TRUE = 1; | 1879 | public const int TRUE = 1; |
1881 | public const int FALSE = 0; | 1880 | public const int FALSE = 0; |
@@ -2162,7 +2161,6 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2162 | public const int PRIM_SCULPT_TYPE_PLANE = 3; | 2161 | public const int PRIM_SCULPT_TYPE_PLANE = 3; |
2163 | public const int PRIM_SCULPT_TYPE_CYLINDER = 4; | 2162 | public const int PRIM_SCULPT_TYPE_CYLINDER = 4; |
2164 | 2163 | ||
2165 | |||
2166 | public const int MASK_BASE = 0; | 2164 | public const int MASK_BASE = 0; |
2167 | public const int MASK_OWNER = 1; | 2165 | public const int MASK_OWNER = 1; |
2168 | public const int MASK_GROUP = 2; | 2166 | public const int MASK_GROUP = 2; |
@@ -2210,6 +2208,5 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2210 | // Can not be public const? | 2208 | // Can not be public const? |
2211 | public vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0); | 2209 | public vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0); |
2212 | public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0); | 2210 | public rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0); |
2213 | |||
2214 | } | 2211 | } |
2215 | } | 2212 | } |