aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-17 21:00:34 +0000
committerJustin Clarke Casey2008-11-17 21:00:34 +0000
commitc25a0ea7923aa390d30b8eebdbca4e599edf9b0d (patch)
tree775133790681153be9edc6d640162271750a1fd0 /OpenSim/Region/ClientStack
parent* minor: add interface version to 'show version' command output (diff)
downloadopensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip
opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz
opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2
opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.xz
* Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch. * Appears to be okay on a very short sniff test * Source code will be placed in opensim-libs shortly
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index aa3cd85..4a4dcd8 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3889,7 +3889,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3889 { 3889 {
3890 uint regionX; 3890 uint regionX;
3891 uint regionY; 3891 uint regionY;
3892 Helpers.LongToUInts(Scene.RegionInfo.RegionHandle, out regionX, out regionY); 3892 Utils.LongToUInts(Scene.RegionInfo.RegionHandle, out regionX, out regionY);
3893 locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - regionX; 3893 locx = Convert.ToSingle(Utils.BytesToString(gmParams[0].Parameter)) - regionX;
3894 locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - regionY; 3894 locy = Convert.ToSingle(Utils.BytesToString(gmParams[1].Parameter)) - regionY;
3895 locz = Convert.ToSingle(Utils.BytesToString(gmParams[2].Parameter)); 3895 locz = Convert.ToSingle(Utils.BytesToString(gmParams[2].Parameter));
@@ -7174,7 +7174,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7174 Transfer.TransferInfo.Params = new byte[20]; 7174 Transfer.TransferInfo.Params = new byte[20];
7175 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16); 7175 Array.Copy(req.RequestAssetID.GetBytes(), 0, Transfer.TransferInfo.Params, 0, 16);
7176 int assType = req.AssetInf.Type; 7176 int assType = req.AssetInf.Type;
7177 Array.Copy(Helpers.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4); 7177 Array.Copy(Utils.IntToBytes(assType), 0, Transfer.TransferInfo.Params, 16, 4);
7178 } 7178 }
7179 else if (req.AssetRequestSource == 3) 7179 else if (req.AssetRequestSource == 3)
7180 { 7180 {