diff options
author | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-09-09 16:20:46 -0400 |
commit | df9f80aabd872c11711e1e4efb400a1921a9cab2 (patch) | |
tree | a7d5582ed1d763224727c8a6bdf9c1c94a674abd /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
parent | * Lock timers when Calling Start() and Stop() when the Thread Context is murk... (diff) | |
parent | De-hardcode default home locations on create user (standalone). (diff) | |
download | opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.zip opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.gz opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.bz2 opensim-SC_OLD-df9f80aabd872c11711e1e4efb400a1921a9cab2.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 39 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 |
2 files changed, 23 insertions, 24 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(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index bca019b..726b37a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1457,7 +1457,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1457 | notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length " | 1457 | notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length " |
1458 | + textLength.ToString() + "\n" + notecardData + "}\n"; | 1458 | + textLength.ToString() + "\n" + notecardData + "}\n"; |
1459 | 1459 | ||
1460 | asset.Data = Encoding.ASCII.GetBytes(notecardData); | 1460 | asset.Data = Encoding.UTF8.GetBytes(notecardData); |
1461 | World.AssetService.Store(asset); | 1461 | World.AssetService.Store(asset); |
1462 | 1462 | ||
1463 | // Create Task Entry | 1463 | // Create Task Entry |
@@ -1522,7 +1522,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1522 | AssetBase a = World.AssetService.Get(assetID.ToString()); | 1522 | AssetBase a = World.AssetService.Get(assetID.ToString()); |
1523 | if (a != null) | 1523 | if (a != null) |
1524 | { | 1524 | { |
1525 | System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); | 1525 | System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding(); |
1526 | string data = enc.GetString(a.Data); | 1526 | string data = enc.GetString(a.Data); |
1527 | NotecardCache.Cache(assetID, data); | 1527 | NotecardCache.Cache(assetID, data); |
1528 | } | 1528 | } |
@@ -1575,7 +1575,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1575 | AssetBase a = World.AssetService.Get(assetID.ToString()); | 1575 | AssetBase a = World.AssetService.Get(assetID.ToString()); |
1576 | if (a != null) | 1576 | if (a != null) |
1577 | { | 1577 | { |
1578 | System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); | 1578 | System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding(); |
1579 | string data = enc.GetString(a.Data); | 1579 | string data = enc.GetString(a.Data); |
1580 | NotecardCache.Cache(assetID, data); | 1580 | NotecardCache.Cache(assetID, data); |
1581 | } | 1581 | } |
@@ -1632,7 +1632,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1632 | AssetBase a = World.AssetService.Get(assetID.ToString()); | 1632 | AssetBase a = World.AssetService.Get(assetID.ToString()); |
1633 | if (a != null) | 1633 | if (a != null) |
1634 | { | 1634 | { |
1635 | System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); | 1635 | System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding(); |
1636 | string data = enc.GetString(a.Data); | 1636 | string data = enc.GetString(a.Data); |
1637 | NotecardCache.Cache(assetID, data); | 1637 | NotecardCache.Cache(assetID, data); |
1638 | } | 1638 | } |