diff options
author | Melanie | 2011-01-27 05:18:28 +0000 |
---|---|---|
committer | Melanie | 2011-01-27 05:18:28 +0000 |
commit | 42c22f41ddfac9777484be136f80de4251ef6d00 (patch) | |
tree | b13c6e256bcc3fb02a4f3f14ec487b6565c08d28 /OpenSim/Framework/Console | |
parent | Add a TeleportFlags member to SP so we can tell how we got there. (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-42c22f41ddfac9777484be136f80de4251ef6d00.zip opensim-SC-42c22f41ddfac9777484be136f80de4251ef6d00.tar.gz opensim-SC-42c22f41ddfac9777484be136f80de4251ef6d00.tar.bz2 opensim-SC-42c22f41ddfac9777484be136f80de4251ef6d00.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-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 | } |