From a523ed1e4d4c8e9c4366fddaaf6a67fe35a9859f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 28 Feb 2013 21:15:14 +0000
Subject: Fix bug where simultaneous calls by different scripts to
llGetNotecardLine() or llGetNumberOfNotecardLines() would sometimes not
trigger a dataserver event.
This was because the notecard asset ID was being used as the request identifier.
Now using a random ID, in common with other code using the DataServer
---
.../Shared/Api/Implementation/LSL_Api.cs | 26 ++++++++++++----------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6a31568..ec24dc2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -10806,14 +10806,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return UUID.Zero.ToString();
}
+ string reqIdentifier = UUID.Random().ToString();
+
// was: UUID tid = tid = AsyncCommands.
- UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, assetID.ToString());
+ UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, reqIdentifier);
if (NotecardCache.IsCached(assetID))
{
- AsyncCommands.
- DataserverPlugin.DataserverReply(assetID.ToString(),
- NotecardCache.GetLines(assetID).ToString());
+ AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(assetID).ToString());
+
ScriptSleep(100);
return tid.ToString();
}
@@ -10829,9 +10830,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
string data = Encoding.UTF8.GetString(a.Data);
//m_log.Debug(data);
NotecardCache.Cache(id, data);
- AsyncCommands.
- DataserverPlugin.DataserverReply(id.ToString(),
- NotecardCache.GetLines(id).ToString());
+ AsyncCommands.DataserverPlugin.DataserverReply(reqIdentifier, NotecardCache.GetLines(id).ToString());
});
ScriptSleep(100);
@@ -10860,13 +10859,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return UUID.Zero.ToString();
}
+ string reqIdentifier = UUID.Random().ToString();
+
// was: UUID tid = tid = AsyncCommands.
- UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, assetID.ToString());
+ UUID tid = AsyncCommands.DataserverPlugin.RegisterRequest(m_host.LocalId, m_item.ItemID, reqIdentifier);
if (NotecardCache.IsCached(assetID))
{
- AsyncCommands.DataserverPlugin.DataserverReply(assetID.ToString(),
- NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
+ AsyncCommands.DataserverPlugin.DataserverReply(
+ reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
+
ScriptSleep(100);
return tid.ToString();
}
@@ -10882,8 +10884,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
string data = Encoding.UTF8.GetString(a.Data);
//m_log.Debug(data);
NotecardCache.Cache(id, data);
- AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(),
- NotecardCache.GetLine(id, line, m_notecardLineReadCharsMax));
+ AsyncCommands.DataserverPlugin.DataserverReply(
+ reqIdentifier, NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
});
ScriptSleep(100);
--
cgit v1.1