From 996a6c2eeacf25456d2ffc12e59c34240cf8a578 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 14 Dec 2013 01:34:28 +0000
Subject: After previous discussion, put eye-catcher 'SCRIPT READY' messages to
console rather than log as warning
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
---
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4ab6908..566772d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -135,8 +135,8 @@ namespace OpenSim.Framework.Servers
TimeSpan timeTaken = DateTime.Now - m_startuptime;
- m_log.InfoFormat(
- "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.",
+ MainConsole.Instance.OutputFormat(
+ "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED. Non-script portion of startup took {0}m {1}s.",
timeTaken.Minutes, timeTaken.Seconds);
}
--
cgit v1.1
From 957449e62cda67a641162043e21cd102f6f99080 Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Mon, 9 Dec 2013 03:15:40 -0500
Subject: ParseNotecardToList() returned data past end of notecard text (mantis
#6881).
---
OpenSim/Framework/SLUtil.cs | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index 537de7a..cb73e8f 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -247,12 +247,18 @@ namespace OpenSim.Framework
///
public static List ParseNotecardToList(string rawInput)
{
- string[] input = rawInput.Replace("\r", "").Split('\n');
+ string[] input;
int idx = 0;
int level = 0;
List output = new List();
string[] words;
+ //The Linden format always ends with a } after the input data.
+ //Strip off trailing } so there is nothing after the input data.
+ int i = rawInput.LastIndexOf("}");
+ rawInput = rawInput.Remove(i, rawInput.Length-i);
+ input = rawInput.Replace("\r", "").Split('\n');
+
while (idx < input.Length)
{
if (input[idx] == "{")
@@ -287,24 +293,18 @@ namespace OpenSim.Framework
break;
if (words[0] == "Text")
{
- int len = int.Parse(words[2]);
- idx++;
+ idx++; //Now points to first line of notecard text
- int count = -1;
+ //Number of lines in notecard.
+ int lines = input.Length - idx;
+ int line = 0;
- while (count < len && idx < input.Length)
+ while (line < lines)
{
- // int l = input[idx].Length;
- string ln = input[idx];
-
- int need = len-count-1;
- if (ln.Length > need)
- ln = ln.Substring(0, need);
-
-// m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", ln);
- output.Add(ln);
- count += ln.Length + 1;
+// m_log.DebugFormat("[PARSE NOTECARD]: Adding line {0}", input[idx]);
+ output.Add(input[idx]);
idx++;
+ line++;
}
return output;
--
cgit v1.1