aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-10 10:28:49 +0000
committerTeravus Ovares2008-05-10 10:28:49 +0000
commite8478dadc87586aaed173f60c44bc5ee2722d9dd (patch)
tree71b5fdd25c0ba50c595dfe7e9d1f017d68277988 /OpenSim/Region/Environment
parent* Resolve mantis 1182. Doesn't actually implement llGiveInventoryList - mere... (diff)
downloadopensim-SC_OLD-e8478dadc87586aaed173f60c44bc5ee2722d9dd.zip
opensim-SC_OLD-e8478dadc87586aaed173f60c44bc5ee2722d9dd.tar.gz
opensim-SC_OLD-e8478dadc87586aaed173f60c44bc5ee2722d9dd.tar.bz2
opensim-SC_OLD-e8478dadc87586aaed173f60c44bc5ee2722d9dd.tar.xz
* Experiment in Zerocoding.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
3 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 9a6b83a..6270893 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -193,6 +193,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
193 ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket(); 193 ConfirmXferPacketPacket newPack = new ConfirmXferPacketPacket();
194 newPack.XferID.ID = xferID; 194 newPack.XferID.ID = xferID;
195 newPack.XferID.Packet = packetID; 195 newPack.XferID.Packet = packetID;
196 newPack.Header.Zerocoded = true;
196 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset); 197 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
197 if ((packetID & 0x80000000) != 0) 198 if ((packetID & 0x80000000) != 0)
198 { 199 {
@@ -250,6 +251,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
250 newPack.XferID.VFileID = Asset.FullID; 251 newPack.XferID.VFileID = Asset.FullID;
251 newPack.XferID.FilePath = 0; 252 newPack.XferID.FilePath = 0;
252 newPack.XferID.Filename = new byte[0]; 253 newPack.XferID.Filename = new byte[0];
254 newPack.Header.Zerocoded = true;
253 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset); 255 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
254 } 256 }
255 257
@@ -260,6 +262,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
260 newPack.AssetBlock.Type = Asset.Type; 262 newPack.AssetBlock.Type = Asset.Type;
261 newPack.AssetBlock.Success = true; 263 newPack.AssetBlock.Success = true;
262 newPack.AssetBlock.UUID = Asset.FullID; 264 newPack.AssetBlock.UUID = Asset.FullID;
265 newPack.Header.Zerocoded = true;
263 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset); 266 ourClient.OutPacket(newPack, ThrottleOutPacketType.Asset);
264 m_finished = true; 267 m_finished = true;
265 if (m_createItem) 268 if (m_createItem)
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index 02c541b..e19274e 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -157,6 +157,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
157 im.ImageID.Size = (uint) m_asset.Data.Length; 157 im.ImageID.Size = (uint) m_asset.Data.Length;
158 im.ImageData.Data = m_asset.Data; 158 im.ImageData.Data = m_asset.Data;
159 im.ImageID.Codec = 2; 159 im.ImageID.Codec = 2;
160 im.Header.Zerocoded = true;
160 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); 161 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
161 PacketCounter++; 162 PacketCounter++;
162 } 163 }
@@ -170,6 +171,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
170 im.ImageData.Data = new byte[600]; 171 im.ImageData.Data = new byte[600];
171 Array.Copy(m_asset.Data, 0, im.ImageData.Data, 0, 600); 172 Array.Copy(m_asset.Data, 0, im.ImageData.Data, 0, 600);
172 im.ImageID.Codec = 2; 173 im.ImageID.Codec = 2;
174 im.Header.Zerocoded = true;
173 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); 175 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
174 PacketCounter++; 176 PacketCounter++;
175 } 177 }
@@ -193,6 +195,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
193 m_asset.FullID.ToString()); 195 m_asset.FullID.ToString());
194 return; 196 return;
195 } 197 }
198 im.Header.Zerocoded = true;
196 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); 199 RequestUser.OutPacket(im, ThrottleOutPacketType.Texture);
197 PacketCounter++; 200 PacketCounter++;
198 } 201 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index aae6af8..1ba17dc 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1424,6 +1424,7 @@ namespace OpenSim.Region.Environment.Scenes
1424 objPropDB.Name = Helpers.StringToField(RootPart.Name); 1424 objPropDB.Name = Helpers.StringToField(RootPart.Name);
1425 objPropDB.Description = Helpers.StringToField(RootPart.Description); 1425 objPropDB.Description = Helpers.StringToField(RootPart.Description);
1426 objPropFamilyPack.ObjectData = objPropDB; 1426 objPropFamilyPack.ObjectData = objPropDB;
1427 objPropFamilyPack.Header.Zerocoded = true;
1427 remoteClient.OutPacket(objPropFamilyPack, ThrottleOutPacketType.Task); 1428 remoteClient.OutPacket(objPropFamilyPack, ThrottleOutPacketType.Task);
1428 } 1429 }
1429 1430
@@ -1975,7 +1976,7 @@ namespace OpenSim.Region.Environment.Scenes
1975// proper.ObjectData[0].AggregatePerms = 53; 1976// proper.ObjectData[0].AggregatePerms = 53;
1976// proper.ObjectData[0].AggregatePermTextures = 0; 1977// proper.ObjectData[0].AggregatePermTextures = 0;
1977// proper.ObjectData[0].AggregatePermTexturesOwner = 0; 1978// proper.ObjectData[0].AggregatePermTexturesOwner = 0;
1978 1979 proper.Header.Zerocoded = true;
1979 client.OutPacket(proper, ThrottleOutPacketType.Task); 1980 client.OutPacket(proper, ThrottleOutPacketType.Task);
1980 } 1981 }
1981 1982