OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Apply http://opensimulator.org/mantis/view.php?id=2212 

* Update llGetNumberOfNotecardLines() and llGetNotecardLine() to use dataserver on dotnetengine
* Thanks M.Igarashi
0.6.0-stable
Justin Clarke Casey 2008-09-18 18:58:39 +00:00
parent 8ff1bc5b03
commit 48978ba3e0
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
View File

@ -1601,7 +1601,7 @@ namespace OpenSim.Region.ScriptEngine.Common
return m_LSL_Functions.llGetNumberOfPrims(); return m_LSL_Functions.llGetNumberOfPrims();
} }
public int llGetNumberOfNotecardLines(string name) public string llGetNumberOfNotecardLines(string name)
{ {
return m_LSL_Functions.llGetNumberOfNotecardLines(name); return m_LSL_Functions.llGetNumberOfNotecardLines(name);
} }

35
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -8210,22 +8210,26 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
throw new Exception("LSL Runtime Error: " + msg); throw new Exception("LSL Runtime Error: " + msg);
} }
public int llGetNumberOfNotecardLines(string name)
public string llGetNumberOfNotecardLines(string name)
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// TODO: this script function should actually return
// the number of lines via the dataserver event
// once it is implemented - krtaylor
String[] notecardLines = GetNotecardLines(name); String[] notecardLines = GetNotecardLines(name);
if (!String.IsNullOrEmpty(notecardLines[0])) if (!String.IsNullOrEmpty(notecardLines[0]))
{ {
return notecardLines.Length; 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(), notecardLines.Length.ToString());
return tid.ToString();
} }
else else
{ {
return 0; return UUID.Zero.ToString();
} }
// ScriptSleep(100); // ScriptSleep(100);
} }
@ -8234,24 +8238,27 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// TODO: this script function should actually return
// the requested notecard line via the dataserver event
// once it is implemented - krtaylor
String[] notecardLines = GetNotecardLines(name); String[] notecardLines = GetNotecardLines(name);
line--; // array starts at 0 // line index starts at zero
if ((!String.IsNullOrEmpty(notecardLines[0])) && if ((!String.IsNullOrEmpty(notecardLines[0])) &&
(line >= 0) && (line >= 0) &&
(line < notecardLines.Length)) (line < notecardLines.Length))
{ {
// ScriptSleep(100); // ScriptSleep(100);
return notecardLines[line]; 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(), notecardLines[line]);
return tid.ToString();
} }
else else
{ {
// ScriptSleep(100); // ScriptSleep(100);
return String.Empty; return UUID.Zero.ToString();
} }
} }

2
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
View File

@ -540,7 +540,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: integer llGetNumberOfPrims() //wiki: integer llGetNumberOfPrims()
LSL_Types.LSLInteger llGetNumberOfPrims(); LSL_Types.LSLInteger llGetNumberOfPrims();
//wiki: key llGetNumberOfNotecardLines(string name) //wiki: key llGetNumberOfNotecardLines(string name)
int llGetNumberOfNotecardLines(string name); string llGetNumberOfNotecardLines(string name);
//wiki: list llGetBoundingBox(key object) //wiki: list llGetBoundingBox(key object)
LSL_Types.list llGetBoundingBox(string obj); LSL_Types.list llGetBoundingBox(string obj);
//wiki: vector llGetGeometricCenter() //wiki: vector llGetGeometricCenter()