aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJeff Ames2008-06-10 08:35:46 +0000
committerJeff Ames2008-06-10 08:35:46 +0000
commit5910a49da6e16d6e3718fffad73c8a24efcec80d (patch)
tree5f5852f643a77e72b45ad49af0538bdf0838b760 /OpenSim/Framework
parent* This completes ObjectDuplicateOnRay. (diff)
downloadopensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.zip
opensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.tar.gz
opensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.tar.bz2
opensim-SC_OLD-5910a49da6e16d6e3718fffad73c8a24efcec80d.tar.xz
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs16
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs2
2 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index c813e91..70b3d3c 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -230,13 +230,12 @@ namespace OpenSim.Framework.Console
230 { 230 {
231 try 231 try
232 { 232 {
233 string line = System.Console.ReadLine(); 233 string line = System.Console.ReadLine();
234 while(line == null) 234 while (line == null)
235 { 235 {
236 236 line = System.Console.ReadLine();
237 line = System.Console.ReadLine(); 237 }
238 } 238
239
240 return line; 239 return line;
241 } 240 }
242 catch (Exception e) 241 catch (Exception e)
@@ -364,8 +363,7 @@ namespace OpenSim.Framework.Console
364 public void Prompt() 363 public void Prompt()
365 { 364 {
366 string tempstr = CmdPrompt(m_componentName + "# "); 365 string tempstr = CmdPrompt(m_componentName + "# ");
367 RunCommand(tempstr); 366 RunCommand(tempstr);
368
369 } 367 }
370 368
371 public void RunCommand(string cmdline) 369 public void RunCommand(string cmdline)
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index ca3fd4b..506db31 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Statistics
37 /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane 37 /// Collects sim statistics which aren't already being collected for the linden viewer's statistics pane
38 /// </summary> 38 /// </summary>
39 public class SimExtraStatsCollector : IStatsCollector 39 public class SimExtraStatsCollector : IStatsCollector
40 { 40 {
41 private long abnormalClientThreadTerminations; 41 private long abnormalClientThreadTerminations;
42 42
43 private long assetsInCache; 43 private long assetsInCache;