aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2008-09-20 14:46:09 +0000
committerHomer Horwitz2008-09-20 14:46:09 +0000
commit4d8544dadac114914e4123e27c0d04fc32f8860e (patch)
treee768ac0f2dcd00d13aa05a99bcacbf6c1672c209
parentremove some extraneous debug messages from migrations (diff)
downloadopensim-SC_OLD-4d8544dadac114914e4123e27c0d04fc32f8860e.zip
opensim-SC_OLD-4d8544dadac114914e4123e27c0d04fc32f8860e.tar.gz
opensim-SC_OLD-4d8544dadac114914e4123e27c0d04fc32f8860e.tar.bz2
opensim-SC_OLD-4d8544dadac114914e4123e27c0d04fc32f8860e.tar.xz
Fix Mantis #2215: llGetNotecardLine() not detecting EOF under DNE
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs32
1 files changed, 23 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 6623165..374e401 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -8252,18 +8252,32 @@ namespace OpenSim.Region.ScriptEngine.Common
8252 8252
8253 // line index starts at zero 8253 // line index starts at zero
8254 if ((!String.IsNullOrEmpty(notecardLines[0])) && 8254 if ((!String.IsNullOrEmpty(notecardLines[0])) &&
8255 (line >= 0) && 8255 (line >= 0))
8256 (line < notecardLines.Length))
8257 { 8256 {
8258 // ScriptSleep(100); 8257 if (line < notecardLines.Length)
8259 UUID rq = UUID.Random(); 8258 {
8259 // ScriptSleep(100);
8260 UUID rq = UUID.Random();
8260 8261
8261 UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest( 8262 UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest(
8262 m_localID, m_itemID, rq.ToString()); 8263 m_localID, m_itemID, rq.ToString());
8263 8264
8264 m_ScriptEngine.m_ASYNCLSLCommandManager. 8265 m_ScriptEngine.m_ASYNCLSLCommandManager.
8265 m_Dataserver.DataserverReply(rq.ToString(), notecardLines[line]); 8266 m_Dataserver.DataserverReply(rq.ToString(), notecardLines[line]);
8266 return tid.ToString(); 8267 return tid.ToString();
8268 }
8269 else
8270 {
8271 // ScriptSleep(100);
8272 UUID rq = UUID.Random();
8273
8274 UUID tid = m_ScriptEngine.m_ASYNCLSLCommandManager.m_Dataserver.RegisterRequest(
8275 m_localID, m_itemID, rq.ToString());
8276
8277 m_ScriptEngine.m_ASYNCLSLCommandManager.
8278 m_Dataserver.DataserverReply(rq.ToString(), BuiltIn_Commands_BaseClass.EOF);
8279 return tid.ToString();
8280 }
8267 } 8281 }
8268 else 8282 else
8269 { 8283 {