diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 |
2 files changed, 8 insertions, 8 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..017a6f6 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); |
@@ -9539,8 +9539,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9539 | return; | 9539 | return; |
9540 | } | 9540 | } |
9541 | 9541 | ||
9542 | System.Text.ASCIIEncoding enc = | 9542 | System.Text.UTF8Encoding enc = |
9543 | new System.Text.ASCIIEncoding(); | 9543 | new System.Text.UTF8Encoding(); |
9544 | string data = enc.GetString(a.Data); | 9544 | string data = enc.GetString(a.Data); |
9545 | //m_log.Debug(data); | 9545 | //m_log.Debug(data); |
9546 | NotecardCache.Cache(id, data); | 9546 | NotecardCache.Cache(id, data); |
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 | } |