diff options
author | MW | 2007-09-11 14:33:32 +0000 |
---|---|---|
committer | MW | 2007-09-11 14:33:32 +0000 |
commit | 3a1ddca8a16b48cefa511a5e265690b09d6d72e1 (patch) | |
tree | 456bf82e4d671e404245567147131387c5549908 | |
parent | * minor refactorings (diff) | |
download | opensim-SC_OLD-3a1ddca8a16b48cefa511a5e265690b09d6d72e1.zip opensim-SC_OLD-3a1ddca8a16b48cefa511a5e265690b09d6d72e1.tar.gz opensim-SC_OLD-3a1ddca8a16b48cefa511a5e265690b09d6d72e1.tar.bz2 opensim-SC_OLD-3a1ddca8a16b48cefa511a5e265690b09d6d72e1.tar.xz |
Fixing namespace problems
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/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; | |||
9 | using libsecondlife.Packets; | 9 | using libsecondlife.Packets; |
10 | using OpenSim.Framework.Interfaces; | 10 | using OpenSim.Framework.Interfaces; |
11 | using OpenSim.Framework.Types; | 11 | using OpenSim.Framework.Types; |
12 | using OpenSim.Framework.Utilities; | ||
12 | using OpenSim.Region.Environment.Scenes.Scripting; | 13 | using OpenSim.Region.Environment.Scenes.Scripting; |
13 | using OpenSim.Framework; | 14 | using OpenSim.Framework; |
14 | using OpenSim.Region.Physics.Manager; | 15 | 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; | |||
8 | using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler; | 8 | using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler; |
9 | using OpenSim.Region.ScriptEngine.Common; | 9 | using OpenSim.Region.ScriptEngine.Common; |
10 | using OpenSim.Framework.Console; | 10 | using OpenSim.Framework.Console; |
11 | using OpenSim.Framework.Utilities; | ||
11 | using System.Runtime.Remoting.Lifetime; | 12 | using System.Runtime.Remoting.Lifetime; |
12 | 13 | ||
13 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | 14 | namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler |
@@ -79,9 +80,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
79 | 80 | ||
80 | public double llFrand(double mag) | 81 | public double llFrand(double mag) |
81 | { | 82 | { |
82 | lock (OpenSim.Framework.Util.RandomClass) | 83 | lock (Util.RandomClass) |
83 | { | 84 | { |
84 | return OpenSim.Framework.Util.RandomClass.Next((int)mag); | 85 | return Util.RandomClass.Next((int)mag); |
85 | } | 86 | } |
86 | } | 87 | } |
87 | 88 | ||
@@ -597,7 +598,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
597 | 598 | ||
598 | public string llMD5String(string src, int nonce) | 599 | public string llMD5String(string src, int nonce) |
599 | { | 600 | { |
600 | return OpenSim.Framework.Util.Md5Hash(src + ":" + nonce.ToString()); | 601 | return Util.Md5Hash(src + ":" + nonce.ToString()); |
601 | } | 602 | } |
602 | 603 | ||
603 | public void llSetPrimitiveParams(List<string> rules) { } | 604 | public void llSetPrimitiveParams(List<string> rules) { } |
@@ -731,7 +732,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler | |||
731 | 732 | ||
732 | public int llGetUnixTime() | 733 | public int llGetUnixTime() |
733 | { | 734 | { |
734 | return OpenSim.Framework.Util.UnixTimeSinceEpoch(); | 735 | return Util.UnixTimeSinceEpoch(); |
735 | } | 736 | } |
736 | 737 | ||
737 | public int llGetParcelFlags(LSL_Types.Vector3 pos) { return 0; } | 738 | public int llGetParcelFlags(LSL_Types.Vector3 pos) { return 0; } |