ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Converted a large number of ASCII encodings to UTF8.

Browse Source 
* We should not be using ASCII anywhere except for legacy compatibility reasons.
* A large number of UTF8 Encoders are being used in places where we should be using Util.StringToField instead. These have been tagged with // ENCODING FAULT
* This should fix Mantis#799 - Japanese Profile Text does not work.
This commit is contained in:
Adam Frisby
2008-03-21 02:26:00 +00:00
parent dc79146d01
commit 7286bd60b0
7 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ClientStack/ClientView.cs
View File

@@ -84,7 +84,8 @@ namespace OpenSim.Region.ClientStack
private int m_lastPacketsReceived = 0;
private byte[] ZeroOutBuffer = new byte[4096];
private readonly Encoding m_encoding = Encoding.ASCII;
// ENCODING FAULT
private readonly Encoding m_encoding = Encoding.UTF8;
private readonly LLUUID m_agentId;
private readonly uint m_circuitCode;
private int m_moneyBalance;
@@ -1165,7 +1166,8 @@ namespace OpenSim.Region.ClientStack
// 6 to 7 items at a time, so let's stick with 6
int MAX_ITEMS_PER_PACKET = 6;
Encoding enc = Encoding.ASCII;
// ENCODING FAULT
Encoding enc = Encoding.UTF8;
uint FULL_MASK_PERMISSIONS = 2147483647;
if (fetchItems)
@@ -1336,7 +1338,8 @@ namespace OpenSim.Region.ClientStack
public void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item)
{
Encoding enc = Encoding.ASCII;
// ENCODING FAULT
Encoding enc = Encoding.UTF8;
uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
FetchInventoryReplyPacket inventoryReply = (FetchInventoryReplyPacket)PacketPool.Instance.GetPacket(PacketType.FetchInventoryReply);
// TODO: don't create new blocks if recycling an old packet
@@ -1378,7 +1381,8 @@ namespace OpenSim.Region.ClientStack
/// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see>
public void SendInventoryItemCreateUpdate(InventoryItemBase Item)
{
Encoding enc = Encoding.ASCII;
// ENCODING FAULT
Encoding enc = Encoding.UTF8;
uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
UpdateCreateInventoryItemPacket InventoryReply = (UpdateCreateInventoryItemPacket)PacketPool.Instance.GetPacket(PacketType.UpdateCreateInventoryItem);
// TODO: don't create new blocks if recycling an old packet
@@ -2213,7 +2217,8 @@ namespace OpenSim.Region.ClientStack
{
objdata.TextureEntry = textureEntry;
}
Encoding enc = Encoding.ASCII;
// ENCODING FAULT
Encoding enc = Encoding.UTF8;
LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
pos.X = 100f;
objdata.ID = 8880000;
@@ -2941,7 +2946,8 @@ namespace OpenSim.Region.ClientStack
}
else
{
Encoding _enc = Encoding.ASCII;
// ENCODING FAULT
Encoding _enc = Encoding.UTF8;
switch (Pack.Type)
{
@@ -3989,7 +3995,7 @@ namespace OpenSim.Region.ClientStack
OutPacket(tpStart, ThrottleOutPacketType.Task);
TeleportProgressPacket tpProgress = (TeleportProgressPacket)PacketPool.Instance.GetPacket(PacketType.TeleportProgress);
tpProgress.Info.Message = (new ASCIIEncoding()).GetBytes("sending_landmark");
tpProgress.Info.Message = (new UTF8Encoding()).GetBytes("sending_landmark");
tpProgress.Info.TeleportFlags = 8;
tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
OutPacket(tpProgress, ThrottleOutPacketType.Task);