diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz |
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs index 5a9b0aa..9cdffaa 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs | |||
@@ -36,6 +36,7 @@ using System.Reflection; | |||
36 | using System.Net.Sockets; | 36 | using System.Net.Sockets; |
37 | using System.Text; | 37 | using System.Text; |
38 | using System.Text.RegularExpressions; | 38 | using System.Text.RegularExpressions; |
39 | using log4net; | ||
39 | 40 | ||
40 | namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog | 41 | namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog |
41 | { | 42 | { |
@@ -45,6 +46,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog | |||
45 | /// </summary> | 46 | /// </summary> |
46 | public class YP | 47 | public class YP |
47 | { | 48 | { |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | private static Fail _fail = new Fail(); | 50 | private static Fail _fail = new Fail(); |
49 | private static Repeat _repeat = new Repeat(); | 51 | private static Repeat _repeat = new Repeat(); |
50 | private static Dictionary<NameArity, List<IClause>> _predicatesStore = | 52 | private static Dictionary<NameArity, List<IClause>> _predicatesStore = |
@@ -2341,7 +2343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog | |||
2341 | string results = ""; | 2343 | string results = ""; |
2342 | for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) | 2344 | for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) |
2343 | { | 2345 | { |
2344 | //Console.WriteLine( m ); | 2346 | //m_log.Debug( m ); |
2345 | results += presep+ m + postsep; | 2347 | results += presep+ m + postsep; |
2346 | } | 2348 | } |
2347 | return results; | 2349 | return results; |
@@ -2359,7 +2361,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog | |||
2359 | } | 2361 | } |
2360 | catch | 2362 | catch |
2361 | { | 2363 | { |
2362 | Console.WriteLine("Failed to connect to server at {0}:999", "localhost"); | 2364 | m_log.Error("Failed to connect to server at localhost:999"); |
2363 | return ""; | 2365 | return ""; |
2364 | } | 2366 | } |
2365 | 2367 | ||
@@ -2379,16 +2381,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog | |||
2379 | streamWriter.Flush(); | 2381 | streamWriter.Flush(); |
2380 | 2382 | ||
2381 | cycOutputString = streamReader.ReadLine(); | 2383 | cycOutputString = streamReader.ReadLine(); |
2382 | Console.WriteLine("Cycoutput:" + cycOutputString); | 2384 | m_log.Debug("Cycoutput:" + cycOutputString); |
2383 | //streamWriter.WriteLine("Client Message"); | 2385 | //streamWriter.WriteLine("Client Message"); |
2384 | //Console.WriteLine("Client Message"); | 2386 | //m_log.Debug("Client Message"); |
2385 | streamWriter.Flush(); | 2387 | streamWriter.Flush(); |
2386 | } | 2388 | } |
2387 | 2389 | ||
2388 | } | 2390 | } |
2389 | catch | 2391 | catch |
2390 | { | 2392 | { |
2391 | Console.WriteLine("Exception reading from Server"); | 2393 | m_log.Error("Exception reading from Server"); |
2392 | return ""; | 2394 | return ""; |
2393 | } | 2395 | } |
2394 | // tidy up | 2396 | // tidy up |