From 3234472d6203671a492a73042a0b56d6301903e0 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Wed, 19 Nov 2008 06:15:21 +0000 Subject: 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 --- 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 adb55aa..cd50e9e 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 = Utils.BytesToUInt16(data, i); + ushort epType = Helpers.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 = Utils.BytesToFloat(data, pos + 4); - _lightCutoff = Utils.BytesToFloat(data, pos + 8); - _lightFalloff = Utils.BytesToFloat(data, pos + 12); + _lightRadius = Helpers.BytesToFloat(data, pos + 4); + _lightCutoff = Helpers.BytesToFloat(data, pos + 8); + _lightFalloff = Helpers.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); - Utils.FloatToBytes(_lightRadius).CopyTo(data, 4); - Utils.FloatToBytes(_lightCutoff).CopyTo(data, 8); - Utils.FloatToBytes(_lightFalloff).CopyTo(data, 12); + Helpers.FloatToBytes(_lightRadius).CopyTo(data, 4); + Helpers.FloatToBytes(_lightCutoff).CopyTo(data, 8); + Helpers.FloatToBytes(_lightFalloff).CopyTo(data, 12); return data; } -- cgit v1.1