* SimpleApp is dead, long live OpenSim.Region.Examples.SimpleModule

* This module more or less crashes every region in the instance if you enable it by moving it from local /bin to global /bin
* But hey, it crashes in lots of interesting ways.

1 files changed, 68 insertions, 59 deletions

diff --git a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
index 233974f..75f289b 100644
--- a/OpenSim/Region/Examples/SimpleApp/CpuCounterObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/CpuCounterObject.cs
@@ -1,60 +1,69 @@
-/*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
-*/
-
-using System;
-using System.Diagnostics;
-using libsecondlife;
-using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
-
-namespace SimpleApp
-{
-    public class CpuCounterObject : SceneObjectGroup
-    {
-        private PerformanceCounter m_counter;
-
-        public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos)
-            : base(world, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)
-        {
-            String objectName = "Processor";
-            String counterName = "% Processor Time";
-            String instanceName = "_Total";
-
-            m_counter = new PerformanceCounter(objectName, counterName, instanceName);
-        }
-
-        public override void UpdateMovement()
-        {
-            float cpu = m_counter.NextValue()/40f;
-            LLVector3 size = new LLVector3(cpu, cpu, cpu);
-            //rootPrimitive.ResizeGoup( size );
-
-            base.UpdateMovement();
-        }
-    }
+/*

+* Copyright (c) Contributors, http://opensimulator.org/

+* See CONTRIBUTORS.TXT for a full list of copyright holders.

+*

+* Redistribution and use in source and binary forms, with or without

+* modification, are permitted provided that the following conditions are met:

+*     * Redistributions of source code must retain the above copyright

+*       notice, this list of conditions and the following disclaimer.

+*     * Redistributions in binary form must reproduce the above copyright

+*       notice, this list of conditions and the following disclaimer in the

+*       documentation and/or other materials provided with the distribution.

+*     * Neither the name of the OpenSim Project nor the

+*       names of its contributors may be used to endorse or promote products

+*       derived from this software without specific prior written permission.

+*

+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+* 

+*/

+

+using System;

+using System.Diagnostics;

+using libsecondlife;

+using OpenSim.Framework;

+using OpenSim.Region.Environment.Scenes;

+

+namespace OpenSim.Region.Examples.SimpleModule

+{

+    public class CpuCounterObject : SceneObjectGroup

+    {

+        protected override bool InSceneBackup

+        {

+            get

+            {

+                return false;

+            }

+        }

+

+        private PerformanceCounter m_counter;

+

+        public CpuCounterObject(Scene world, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos)

+            : base(world, regionHandle, ownerID, localID, pos, PrimitiveBaseShape.Default)

+        {

+            String objectName = "Processor";

+            String counterName = "% Processor Time";

+            String instanceName = "_Total";

+

+            m_counter = new PerformanceCounter(objectName, counterName, instanceName);

+        }

+

+        public override void UpdateMovement()

+        {

+            float cpu = m_counter.NextValue()/40f;

+            LLVector3 size = new LLVector3(cpu, cpu, cpu);

+            

+            RootPart.Resize( size );

+

+            base.UpdateMovement();

+        }

+    }

 }
\ No newline at end of file