diff options
author | Adam Frisby | 2008-03-21 02:36:34 +0000 |
---|---|---|
committer | Adam Frisby | 2008-03-21 02:36:34 +0000 |
commit | 803670e6eaaeafa1b7f90b6a7a9f461bd459634a (patch) | |
tree | 47087d5bb58f7704f13624fa1de999f39c8805a5 /OpenSim/Region/ClientStack/ClientView.cs | |
parent | * Removed a bad encoder. (diff) | |
download | opensim-SC_OLD-803670e6eaaeafa1b7f90b6a7a9f461bd459634a.zip opensim-SC_OLD-803670e6eaaeafa1b7f90b6a7a9f461bd459634a.tar.gz opensim-SC_OLD-803670e6eaaeafa1b7f90b6a7a9f461bd459634a.tar.bz2 opensim-SC_OLD-803670e6eaaeafa1b7f90b6a7a9f461bd459634a.tar.xz |
* Removed more encoding faults.
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 23354a1..0f8e196 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -1164,8 +1164,6 @@ namespace OpenSim.Region.ClientStack | |||
1164 | // 6 to 7 items at a time, so let's stick with 6 | 1164 | // 6 to 7 items at a time, so let's stick with 6 |
1165 | int MAX_ITEMS_PER_PACKET = 6; | 1165 | int MAX_ITEMS_PER_PACKET = 6; |
1166 | 1166 | ||
1167 | // ENCODING FAULT | ||
1168 | Encoding enc = Encoding.UTF8; | ||
1169 | uint FULL_MASK_PERMISSIONS = 2147483647; | 1167 | uint FULL_MASK_PERMISSIONS = 2147483647; |
1170 | 1168 | ||
1171 | if (fetchItems) | 1169 | if (fetchItems) |
@@ -1336,8 +1334,6 @@ namespace OpenSim.Region.ClientStack | |||
1336 | 1334 | ||
1337 | public void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item) | 1335 | public void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item) |
1338 | { | 1336 | { |
1339 | // ENCODING FAULT | ||
1340 | Encoding enc = Encoding.UTF8; | ||
1341 | uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; | 1337 | uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; |
1342 | FetchInventoryReplyPacket inventoryReply = (FetchInventoryReplyPacket)PacketPool.Instance.GetPacket(PacketType.FetchInventoryReply); | 1338 | FetchInventoryReplyPacket inventoryReply = (FetchInventoryReplyPacket)PacketPool.Instance.GetPacket(PacketType.FetchInventoryReply); |
1343 | // TODO: don't create new blocks if recycling an old packet | 1339 | // TODO: don't create new blocks if recycling an old packet |
@@ -1379,8 +1375,6 @@ namespace OpenSim.Region.ClientStack | |||
1379 | /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see> | 1375 | /// <see>IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)</see> |
1380 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item) | 1376 | public void SendInventoryItemCreateUpdate(InventoryItemBase Item) |
1381 | { | 1377 | { |
1382 | // ENCODING FAULT | ||
1383 | Encoding enc = Encoding.UTF8; | ||
1384 | uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; | 1378 | uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All; |
1385 | UpdateCreateInventoryItemPacket InventoryReply = (UpdateCreateInventoryItemPacket)PacketPool.Instance.GetPacket(PacketType.UpdateCreateInventoryItem); | 1379 | UpdateCreateInventoryItemPacket InventoryReply = (UpdateCreateInventoryItemPacket)PacketPool.Instance.GetPacket(PacketType.UpdateCreateInventoryItem); |
1386 | // TODO: don't create new blocks if recycling an old packet | 1380 | // TODO: don't create new blocks if recycling an old packet |
@@ -2215,12 +2209,10 @@ namespace OpenSim.Region.ClientStack | |||
2215 | { | 2209 | { |
2216 | objdata.TextureEntry = textureEntry; | 2210 | objdata.TextureEntry = textureEntry; |
2217 | } | 2211 | } |
2218 | // ENCODING FAULT | ||
2219 | Encoding enc = Encoding.UTF8; | ||
2220 | LLVector3 pos = new LLVector3(objdata.ObjectData, 16); | 2212 | LLVector3 pos = new LLVector3(objdata.ObjectData, 16); |
2221 | pos.X = 100f; | 2213 | pos.X = 100f; |
2222 | objdata.ID = 8880000; | 2214 | objdata.ID = 8880000; |
2223 | objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0"); | 2215 | objdata.NameValue = Helpers.StringToField("FirstName STRING RW SV Test \nLastName STRING RW SV User "); |
2224 | //LLVector3 pos2 = new LLVector3(100f, 100f, 23f); | 2216 | //LLVector3 pos2 = new LLVector3(100f, 100f, 23f); |
2225 | //objdata.FullID=user.AgentId; | 2217 | //objdata.FullID=user.AgentId; |
2226 | byte[] pb = pos.GetBytes(); | 2218 | byte[] pb = pos.GetBytes(); |
@@ -2944,9 +2936,6 @@ namespace OpenSim.Region.ClientStack | |||
2944 | } | 2936 | } |
2945 | else | 2937 | else |
2946 | { | 2938 | { |
2947 | // ENCODING FAULT | ||
2948 | Encoding _enc = Encoding.UTF8; | ||
2949 | |||
2950 | switch (Pack.Type) | 2939 | switch (Pack.Type) |
2951 | { | 2940 | { |
2952 | #region Scene/Avatar | 2941 | #region Scene/Avatar |