diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.xz |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 302640b..1281335 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -341,7 +341,8 @@ namespace OpenSim.Framework.Servers | |||
341 | public virtual void Show(string[] showParams) | 341 | public virtual void Show(string[] showParams) |
342 | { | 342 | { |
343 | switch (showParams[0]) | 343 | switch (showParams[0]) |
344 | { | 344 | { |
345 | |||
345 | case "info": | 346 | case "info": |
346 | Notice("Version: " + m_version); | 347 | Notice("Version: " + m_version); |
347 | Notice("Startup directory: " + m_startupDirectory); | 348 | Notice("Startup directory: " + m_startupDirectory); |
@@ -349,7 +350,9 @@ namespace OpenSim.Framework.Servers | |||
349 | 350 | ||
350 | case "stats": | 351 | case "stats": |
351 | if (m_stats != null) | 352 | if (m_stats != null) |
353 | { | ||
352 | Notice(m_stats.Report()); | 354 | Notice(m_stats.Report()); |
355 | } | ||
353 | break; | 356 | break; |
354 | 357 | ||
355 | case "threads": | 358 | case "threads": |