From c25a0ea7923aa390d30b8eebdbca4e599edf9b0d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 17 Nov 2008 21:00:34 +0000 Subject: * 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 --- OpenSim/Framework/PrimitiveBaseShape.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs') diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index cd50e9e..adb55aa 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs @@ -874,7 +874,7 @@ namespace OpenSim.Framework for (int k = 0; k < extraParamCount; k++) { - ushort epType = Helpers.BytesToUInt16(data, i); + ushort epType = Utils.BytesToUInt16(data, i); i += 2; // uint paramLength = Helpers.BytesToUIntBig(data, i); @@ -1014,9 +1014,9 @@ namespace OpenSim.Framework _lightColorG = lColor.G; _lightColorB = lColor.B; - _lightRadius = Helpers.BytesToFloat(data, pos + 4); - _lightCutoff = Helpers.BytesToFloat(data, pos + 8); - _lightFalloff = Helpers.BytesToFloat(data, pos + 12); + _lightRadius = Utils.BytesToFloat(data, pos + 4); + _lightCutoff = Utils.BytesToFloat(data, pos + 8); + _lightFalloff = Utils.BytesToFloat(data, pos + 12); } else { @@ -1040,9 +1040,9 @@ namespace OpenSim.Framework Color4 tmpColor = new Color4(_lightColorR,_lightColorG,_lightColorB,_lightIntensity); tmpColor.GetBytes().CopyTo(data, 0); - Helpers.FloatToBytes(_lightRadius).CopyTo(data, 4); - Helpers.FloatToBytes(_lightCutoff).CopyTo(data, 8); - Helpers.FloatToBytes(_lightFalloff).CopyTo(data, 12); + Utils.FloatToBytes(_lightRadius).CopyTo(data, 4); + Utils.FloatToBytes(_lightCutoff).CopyTo(data, 8); + Utils.FloatToBytes(_lightFalloff).CopyTo(data, 12); return data; } -- cgit v1.1