diff options
| author | Melanie | 2013-01-24 23:25:38 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-24 23:25:38 +0000 |
| commit | c6e6614a447b541d9d985c2a3dd3bb50a89f9b07 (patch) | |
| tree | 023ae4d98fdfb20e8d1cd9c6ce4988e4f2dec842 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make llGiveMoney async again. The return value is now the constant 1 to make (diff) | |
| download | opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.zip opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.gz opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.bz2 opensim-SC_OLD-c6e6614a447b541d9d985c2a3dd3bb50a89f9b07.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 47baac8..65ccd10 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
| @@ -573,7 +573,7 @@ namespace OpenSim.Framework.Servers | |||
| 573 | } | 573 | } |
| 574 | } | 574 | } |
| 575 | 575 | ||
| 576 | protected string GetVersionText() | 576 | public string GetVersionText() |
| 577 | { | 577 | { |
| 578 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); | 578 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); |
| 579 | } | 579 | } |
| @@ -674,4 +674,4 @@ namespace OpenSim.Framework.Servers | |||
| 674 | m_console.OutputFormat(format, components); | 674 | m_console.OutputFormat(format, components); |
| 675 | } | 675 | } |
| 676 | } | 676 | } |
| 677 | } \ No newline at end of file | 677 | } |