diff options
| author | Melanie | 2012-08-29 03:31:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-29 03:31:13 +0100 |
| commit | 899337b4a0584ce2371c3bfcc44387d0f090b792 (patch) | |
| tree | 3a3e862951a85889c3c5762d6d30b5dd80868864 /OpenSim/Tests/Common/TestHelpers.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing rule tracking (diff) | |
| download | opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.zip opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2 opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Common/TestHelpers.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs index 30121fe..57da802 100644 --- a/OpenSim/Tests/Common/TestHelpers.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs | |||
| @@ -95,6 +95,7 @@ namespace OpenSim.Tests.Common | |||
| 95 | public static void EnableLogging() | 95 | public static void EnableLogging() |
| 96 | { | 96 | { |
| 97 | log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream); | 97 | log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream); |
| 98 | EnableLoggingConfigStream.Position = 0; | ||
| 98 | } | 99 | } |
| 99 | 100 | ||
| 100 | /// <summary> | 101 | /// <summary> |