aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-09 18:11:02 +0100
committerJustin Clark-Casey (justincc)2009-09-09 18:11:02 +0100
commit0cdec1fbc304c5f91a90135fb6533be7227820b0 (patch)
tree5193962fec81c97c9f17d8118c90e4c38d49f623 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentminor: suppress mono warning 0162 generated when comparing const RegionSize a... (diff)
parentreformatting. (diff)
downloadopensim-SC_OLD-0cdec1fbc304c5f91a90135fb6533be7227820b0.zip
opensim-SC_OLD-0cdec1fbc304c5f91a90135fb6533be7227820b0.tar.gz
opensim-SC_OLD-0cdec1fbc304c5f91a90135fb6533be7227820b0.tar.bz2
opensim-SC_OLD-0cdec1fbc304c5f91a90135fb6533be7227820b0.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs39
1 files changed, 19 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f261c16..02befda 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9477,8 +9477,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9477 return; 9477 return;
9478 } 9478 }
9479 9479
9480 System.Text.ASCIIEncoding enc = 9480 System.Text.UTF8Encoding enc =
9481 new System.Text.ASCIIEncoding(); 9481 new System.Text.UTF8Encoding();
9482 string data = enc.GetString(a.Data); 9482 string data = enc.GetString(a.Data);
9483 //m_log.Debug(data); 9483 //m_log.Debug(data);
9484 NotecardCache.Cache(id, data); 9484 NotecardCache.Cache(id, data);
@@ -9524,29 +9524,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9524 9524
9525 if (NotecardCache.IsCached(assetID)) 9525 if (NotecardCache.IsCached(assetID))
9526 { 9526 {
9527 AsyncCommands. 9527 AsyncCommands.DataserverPlugin.DataserverReply(assetID.ToString(),
9528 DataserverPlugin.DataserverReply(assetID.ToString(), 9528 NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
9529 NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax));
9530 ConditionalScriptSleep(100); 9529 ConditionalScriptSleep(100);
9531 return tid.ToString(); 9530 return tid.ToString();
9532 } 9531 }
9533 9532
9534 WithNotecard(assetID, delegate (UUID id, AssetBase a) 9533 WithNotecard(assetID, delegate (UUID id, AssetBase a)
9535 { 9534 {
9536 if (a == null || a.Type != 7) 9535 if (a == null || a.Type != 7)
9537 { 9536 {
9538 ShoutError("Notecard '" + name + "' could not be found."); 9537 ShoutError("Notecard '" + name + "' could not be found.");
9539 return; 9538 return;
9540 } 9539 }
9541 9540
9542 System.Text.ASCIIEncoding enc = 9541 System.Text.UTF8Encoding enc =
9543 new System.Text.ASCIIEncoding(); 9542 new System.Text.UTF8Encoding();
9544 string data = enc.GetString(a.Data); 9543 string data = enc.GetString(a.Data);
9545 //m_log.Debug(data); 9544 //m_log.Debug(data);
9546 NotecardCache.Cache(id, data); 9545 NotecardCache.Cache(id, data);
9547 AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(), 9546 AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(),
9548 NotecardCache.GetLine(id, line, m_notecardLineReadCharsMax)); 9547 NotecardCache.GetLine(id, line, m_notecardLineReadCharsMax));
9549 }); 9548 });
9550 9549
9551 ConditionalScriptSleep(100); 9550 ConditionalScriptSleep(100);
9552 return tid.ToString(); 9551 return tid.ToString();