diff options
| author | Mic Bowman | 2011-01-26 13:35:21 -0800 |
|---|---|---|
| committer | Mic Bowman | 2011-01-26 13:35:21 -0800 |
| commit | 2bab8e5538d004447126ce8990d8b2e2b09aacf1 (patch) | |
| tree | e5885ef5df7c69829816c30f5ee72c63fd1829cb /OpenSim/Framework | |
| parent | Remove the RestorePresences functions (which don't seem to be doing (diff) | |
| parent | Add some comments on ILandObject.StartPoint and EndPoint (diff) | |
| download | opensim-SC_OLD-2bab8e5538d004447126ce8990d8b2e2b09aacf1.zip opensim-SC_OLD-2bab8e5538d004447126ce8990d8b2e2b09aacf1.tar.gz opensim-SC_OLD-2bab8e5538d004447126ce8990d8b2e2b09aacf1.tar.bz2 opensim-SC_OLD-2bab8e5538d004447126ce8990d8b2e2b09aacf1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rwxr-xr-x | OpenSim/Framework/Console/ConsoleBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 3ef76cf..c59fbca 100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
| @@ -76,7 +76,7 @@ namespace OpenSim.Framework.Console | |||
| 76 | System.Console.WriteLine(text); | 76 | System.Console.WriteLine(text); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | public virtual void OutputFormat(string format, params string[] components) | 79 | public virtual void OutputFormat(string format, params object[] components) |
| 80 | { | 80 | { |
| 81 | Output(string.Format(format, components)); | 81 | Output(string.Format(format, components)); |
| 82 | } | 82 | } |