ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of brain.opensimulator.org:/var/git/opensim

Browse Source
This commit is contained in:
Melanie
2020-10-13 17:40:34 +01:00
parent 4105bf350e c70904418a
commit bd92b2f8ad
605 changed files with 43895 additions and 36778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ConsoleClient/ConsoleClient.cs
View File

@@ -80,7 +80,7 @@ namespace OpenSim.ConsoleClient
while (m_Server.Running)
{
System.Threading.Thread.Sleep(500);
// MainConsole.Instance.Prompt();
MainConsole.Instance.Prompt();
}
if (pidFile != String.Empty)

5
OpenSim/ConsoleClient/Requester.cs
View File

@@ -67,9 +67,8 @@ namespace OpenSim.ConsoleClient
{
try
{
using (Stream s = response.GetResponseStream())
using (StreamReader r = new StreamReader(s))
reply = r.ReadToEnd();
using (StreamReader r = new StreamReader(response.GetResponseStream()))
reply = r.ReadToEnd();
}
catch (System.InvalidOperationException)