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

fix: unicode notecards not surviving script treatment (fixes #4119 --- 

perhaps).
remotes/origin/0.6.7-post-fixes
dr scofield (aka dirk husemann) 2009-09-08 17:53:28 +02:00
parent 5c606d0233
commit d8a787bd89
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -9477,8 +9477,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
} }
System.Text.ASCIIEncoding enc = System.Text.UTF8Encoding enc =
new System.Text.ASCIIEncoding(); new System.Text.UTF8Encoding();
string data = enc.GetString(a.Data); string data = enc.GetString(a.Data);
//m_log.Debug(data); //m_log.Debug(data);
NotecardCache.Cache(id, data); NotecardCache.Cache(id, data);
@ -9539,8 +9539,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
} }
System.Text.ASCIIEncoding enc = System.Text.UTF8Encoding enc =
new System.Text.ASCIIEncoding(); new System.Text.UTF8Encoding();
string data = enc.GetString(a.Data); string data = enc.GetString(a.Data);
//m_log.Debug(data); //m_log.Debug(data);
NotecardCache.Cache(id, data); NotecardCache.Cache(id, data);

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1457,7 +1457,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length " notecardData = "Linden text version 2\n{\nLLEmbeddedItems version 1\n{\ncount 0\n}\nText length "
+ textLength.ToString() + "\n" + notecardData + "}\n"; + textLength.ToString() + "\n" + notecardData + "}\n";
asset.Data = Encoding.ASCII.GetBytes(notecardData); asset.Data = Encoding.UTF8.GetBytes(notecardData);
World.AssetService.Store(asset); World.AssetService.Store(asset);
// Create Task Entry // Create Task Entry
@ -1522,7 +1522,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AssetBase a = World.AssetService.Get(assetID.ToString()); AssetBase a = World.AssetService.Get(assetID.ToString());
if (a != null) if (a != null)
{ {
System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
string data = enc.GetString(a.Data); string data = enc.GetString(a.Data);
NotecardCache.Cache(assetID, data); NotecardCache.Cache(assetID, data);
} }
@ -1575,7 +1575,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AssetBase a = World.AssetService.Get(assetID.ToString()); AssetBase a = World.AssetService.Get(assetID.ToString());
if (a != null) if (a != null)
{ {
System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
string data = enc.GetString(a.Data); string data = enc.GetString(a.Data);
NotecardCache.Cache(assetID, data); NotecardCache.Cache(assetID, data);
} }
@ -1632,7 +1632,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
AssetBase a = World.AssetService.Get(assetID.ToString()); AssetBase a = World.AssetService.Get(assetID.ToString());
if (a != null) if (a != null)
{ {
System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); System.Text.UTF8Encoding enc = new System.Text.UTF8Encoding();
string data = enc.GetString(a.Data); string data = enc.GetString(a.Data);
NotecardCache.Cache(assetID, data); NotecardCache.Cache(assetID, data);
} }