diff options
author | UbitUmarov | 2013-01-26 03:16:45 +0000 |
---|---|---|
committer | UbitUmarov | 2013-01-26 03:16:45 +0000 |
commit | c58ec342ffaa4f020f3f37ab8ab53517d4a83b71 (patch) | |
tree | 0710d530094ec72d8fc99d627d35d5a29389cc3c /OpenSim/Framework/Servers | |
parent | revert the test, sending again appearance to self in (diff) | |
parent | Make llGiveMoney async again. The return value is now the constant 1 to make (diff) | |
download | opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.zip opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.tar.gz opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.tar.bz2 opensim-SC-c58ec342ffaa4f020f3f37ab8ab53517d4a83b71.tar.xz |
Merge branch 'avination' into ubitwork
Diffstat (limited to '')
-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 c182a3a..9eb2281 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -531,7 +531,7 @@ namespace OpenSim.Framework.Servers | |||
531 | } | 531 | } |
532 | } | 532 | } |
533 | 533 | ||
534 | protected string GetVersionText() | 534 | public string GetVersionText() |
535 | { | 535 | { |
536 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); | 536 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); |
537 | } | 537 | } |
@@ -563,4 +563,4 @@ namespace OpenSim.Framework.Servers | |||
563 | m_console.OutputFormat(format, components); | 563 | m_console.OutputFormat(format, components); |
564 | } | 564 | } |
565 | } | 565 | } |
566 | } \ No newline at end of file | 566 | } |