From 3a1ddca8a16b48cefa511a5e265690b09d6d72e1 Mon Sep 17 00:00:00 2001 From: MW Date: Tue, 11 Sep 2007 14:33:32 +0000 Subject: Fixing namespace problems --- OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 1 + .../DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 81c759d..a592b0b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -9,6 +9,7 @@ using libsecondlife; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Types; +using OpenSim.Framework.Utilities; using OpenSim.Region.Environment.Scenes.Scripting; using OpenSim.Framework; using OpenSim.Region.Physics.Manager; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index d543eca..bdab104 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs @@ -8,6 +8,7 @@ using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler; using OpenSim.Region.ScriptEngine.Common; using OpenSim.Framework.Console; +using OpenSim.Framework.Utilities; using System.Runtime.Remoting.Lifetime; namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler @@ -79,9 +80,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler public double llFrand(double mag) { - lock (OpenSim.Framework.Util.RandomClass) + lock (Util.RandomClass) { - return OpenSim.Framework.Util.RandomClass.Next((int)mag); + return Util.RandomClass.Next((int)mag); } } @@ -597,7 +598,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler public string llMD5String(string src, int nonce) { - return OpenSim.Framework.Util.Md5Hash(src + ":" + nonce.ToString()); + return Util.Md5Hash(src + ":" + nonce.ToString()); } public void llSetPrimitiveParams(List rules) { } @@ -731,7 +732,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler public int llGetUnixTime() { - return OpenSim.Framework.Util.UnixTimeSinceEpoch(); + return Util.UnixTimeSinceEpoch(); } public int llGetParcelFlags(LSL_Types.Vector3 pos) { return 0; } -- cgit v1.1