diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs index 150c519c20..3bd7e4a29a 100644 --- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs @@ -59,7 +59,12 @@ namespace OpenSim.Region.Environment.Scenes OutPacketsPerSecond = 18, PendingDownloads = 19, PendingUploads = 20, - UnAckedBytes = 24 + UnAckedBytes = 24, + + // Havok4 related... May or may not be in upcoming LLclients + // (kelly added them sometime late in January 2008) + NumRCCSLODReduced = 25, + NumRCCSFixed = 26 } // Sending a stats update every 3 seconds diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 65ba4b4251..d25b8c072d 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -211,7 +211,7 @@ namespace OpenSim.Region.Physics.OdePlugin while (d.SpaceLockQuery(space)) { - int i = 0; + } diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index b11ad05b40..9167632636 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -2162,7 +2162,7 @@ namespace OpenSim.Region.ScriptEngine.Common switch ((int)rules.Data[i]) { case (int)LSL_BaseClass.PSYS_PART_FLAGS: - prules.PartFlags = (uint)Convert.ToInt32(rules.Data[i + 1].ToString()); + prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)((uint)Convert.ToInt32(rules.Data[i + 1].ToString())); break; case (int)LSL_BaseClass.PSYS_PART_START_COLOR: @@ -2204,8 +2204,8 @@ namespace OpenSim.Region.ScriptEngine.Common break; case (int)LSL_BaseClass.PSYS_PART_MAX_AGE: - //tempf = (LSL_Types.LSLFloat)rules.Data[i + 1]; - prules.MaxAge = 7;//(float)tempf; + tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); + prules.PartMaxAge = (float)tempf; break; case (int)LSL_BaseClass.PSYS_SRC_ACCEL: @@ -2279,6 +2279,31 @@ namespace OpenSim.Region.ScriptEngine.Common } prules.CRC = 1; + Console.WriteLine("----------ps----------\n"); + Console.WriteLine(" AngularVelocity:" + prules.AngularVelocity.ToString() + "\n" + + " BurstPartCount:" + prules.BurstPartCount.ToString() + "\n" + + " BurstRadius:" + prules.BurstRadius.ToString() + "\n" + + " BurstRate:" + prules.BurstRate.ToString() + "\n" + + " BurstSpeedMax:" + prules.BurstSpeedMax.ToString() + "\n" + + " BurstSpeedMin:" + prules.BurstSpeedMin.ToString() + "\n" + + " CRC:" + prules.CRC.ToString() + "\n" + + " InnerAngle:" + prules.InnerAngle.ToString() + "\n" + + " MaxAge:" + prules.MaxAge.ToString() + "\n" + + " OuterAngle:" + prules.OuterAngle.ToString() + "\n" + + " PartAcceleration:" + prules.PartAcceleration.ToString() + "\n" + + " PartDataFlags:" + prules.PartDataFlags.ToString() + "\n" + + " PartEndColor:" + prules.PartEndColor.ToString() + "\n" + + " PartEndScaleX:" + prules.PartEndScaleX.ToString() + "\n" + + " PartEndScaleY:" + prules.PartEndScaleY.ToString() + "\n" + + " PartFlags:" + prules.PartFlags.ToString() + "\n" + + " PartMaxAge:" + prules.PartMaxAge.ToString() + "\n" + + " PartStartColor:" + prules.PartStartColor.ToString() + "\n" + + " PartStartScaleX:" + prules.PartStartScaleX.ToString() + "\n" + + " PartStartScaleY:" + prules.PartStartScaleY.ToString() + "\n" + + " Pattern:" + prules.Pattern.ToString() + "\n" + + " StartAge:" + prules.StartAge.ToString() + "\n" + + " Target:" + prules.Target.ToString() + "\n" + + " Texture:" + prules.Texture.ToString() + ""); OpenSim.Framework.Console.MainLog.Instance.Verbose("PARTICLE", "PS: " + prules.ToString()); m_host.AddNewParticleSystem(prules); m_host.SendFullUpdateToAllClients(); diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll index 6c20c19e89..9293268b93 100644 Binary files a/bin/libsecondlife.dll and b/bin/libsecondlife.dll differ