diff options
author | gareth | 2007-05-07 16:32:30 +0000 |
---|---|---|
committer | gareth | 2007-05-07 16:32:30 +0000 |
commit | 3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1 (patch) | |
tree | 5d6b1009685278b214100a7901bd4feaeed584da /OpenSim.Framework | |
parent | Updated to have uniform build number (diff) | |
download | opensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.zip opensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.gz opensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.bz2 opensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.xz |
Merged 0.1-prestable back into trunk :(
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Framework.Console/ConsoleBase.cs | 4 | ||||
-rw-r--r-- | OpenSim.Framework/OpenSim.Framework.dll.build | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/OpenSim.Framework.Console/ConsoleBase.cs index 39d2b28..dd8054a 100644 --- a/OpenSim.Framework.Console/ConsoleBase.cs +++ b/OpenSim.Framework.Console/ConsoleBase.cs | |||
@@ -43,6 +43,7 @@ namespace OpenSim.Framework.Console | |||
43 | public void Write(string format, params object[] args) | 43 | public void Write(string format, params object[] args) |
44 | { | 44 | { |
45 | Log.Write(format, args); | 45 | Log.Write(format, args); |
46 | Log.Flush(); | ||
46 | if(!disableOutput) | 47 | if(!disableOutput) |
47 | { | 48 | { |
48 | System.Console.Write(format, args); | 49 | System.Console.Write(format, args); |
@@ -53,7 +54,8 @@ namespace OpenSim.Framework.Console | |||
53 | public void WriteLine(string format, params object[] args) | 54 | public void WriteLine(string format, params object[] args) |
54 | { | 55 | { |
55 | Log.WriteLine(format, args); | 56 | Log.WriteLine(format, args); |
56 | if(!disableOutput) | 57 | Log.Flush(); |
58 | if(!disableOutput) | ||
57 | { | 59 | { |
58 | System.Console.WriteLine(format, args); | 60 | System.Console.WriteLine(format, args); |
59 | } | 61 | } |
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index aa405fb..69ea10a 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -22,7 +22,6 @@ | |||
22 | <include name="UserProfileManager.cs" /> | 22 | <include name="UserProfileManager.cs" /> |
23 | <include name="UserProfileManagerBase.cs" /> | 23 | <include name="UserProfileManagerBase.cs" /> |
24 | <include name="Util.cs" /> | 24 | <include name="Util.cs" /> |
25 | <include name="VersionInfo.cs" /> | ||
26 | <include name="Interfaces/IAssetServer.cs" /> | 25 | <include name="Interfaces/IAssetServer.cs" /> |
27 | <include name="Interfaces/IConfig.cs" /> | 26 | <include name="Interfaces/IConfig.cs" /> |
28 | <include name="Interfaces/IGenericConfig.cs" /> | 27 | <include name="Interfaces/IGenericConfig.cs" /> |