diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 3265817..502fe6a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3890,7 +3890,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3890 | { | 3890 | { |
3891 | uint regionX; | 3891 | uint regionX; |
3892 | uint regionY; | 3892 | uint regionY; |
3893 | Utils.LongToUInts(Scene.RegionInfo.RegionHandle, out regionX, out regionY); | 3893 | Helpers.LongToUInts(Scene.RegionInfo.RegionHandle, out regionX, out regionY); |
3894 | locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - regionX; | 3894 | locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - regionX; |
3895 | locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - regionY; | 3895 | locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - regionY; |
3896 | locz = Convert.ToSingle(Utils.BytesToString(gmParams[2].Parameter)); | 3896 | locz = Convert.ToSingle(Utils.BytesToString(gmParams[2].Parameter)); |
@@ -7175,7 +7175,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7175 | Transfer.TransferInfo.Params = new byte[20]; | 7175 | Transfer.TransferInfo.Params = new byte[20]; |
7176 | Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); | 7176 | Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); |
7177 | int assType = req.AssetInf.Type; | 7177 | int assType = req.AssetInf.Type; |
7178 | Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4); | 7178 | Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4); |
7179 | } | 7179 | } |
7180 | else if (req.AssetRequestSource == 3) | 7180 | else if (req.AssetRequestSource == 3) |
7181 | { | 7181 | { |