Fix Mantis #2215: llGetNotecardLine() not detecting EOF under DNE

0.6.0-stable
Homer Horwitz 2008-09-20 14:46:09 +00:00
parent 6a691df1a6
commit 4d8544dada
1 changed files with 23 additions and 9 deletions

View File

@ -8252,18 +8252,32 @@ namespace OpenSim.Region.ScriptEngine.Common
// line index starts at zero // line index starts at zero
if ((!String.IsNullOrEmpty(notecardLines[0])) && if ((!String.IsNullOrEmpty(notecardLines[0])) &&
(line >= 0) && (line >= 0))
(line < notecardLines.Length))
{ {
// ScriptSleep(100); if (line < notecardLines.Length)
UUID rq = UUID.Random(); {
// ScriptSleep(100);
UUID rq = UUID.Random();
UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest( UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest(
m_localID, m_itemID, rq.ToString()); m_localID, m_itemID, rq.ToString());
m_ScriptEngine.m_ASYNCLSLCommandManager. m_ScriptEngine.m_ASYNCLSLCommandManager.
m_Dataserver.DataserverReply(rq.ToString(), notecardLines[line]); m_Dataserver.DataserverReply(rq.ToString(), notecardLines[line]);
return tid.ToString(); return tid.ToString();
}
else
{
// ScriptSleep(100);
UUID rq = UUID.Random();
UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest(
m_localID, m_itemID, rq.ToString());
m_ScriptEngine.m_ASYNCLSLCommandManager.
m_Dataserver.DataserverReply(rq.ToString(), BuiltIn_Commands_BaseClass.EOF);
return tid.ToString();
}
} }
else else
{ {