make Stopped a property of the SceneObjectPart instead of in the

database code, so this is a shared concept.

2 files changed, 14 insertions, 12 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 9a7f28e..5a02ad4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -402,6 +402,19 @@ namespace OpenSim.Region.Environment.Scenes
             get { return m_shape.Scale; }
         }
 
+        public bool Stopped
+        {
+            get {
+                double threshold = 0.02;
+                return (Math.Abs(Velocity.X) < threshold &&
+                        Math.Abs(Velocity.Y) < threshold &&
+                        Math.Abs(Velocity.Z) < threshold &&
+                        Math.Abs(AngularVelocity.X) < threshold &&
+                        Math.Abs(AngularVelocity.Y) < threshold &&
+                        Math.Abs(AngularVelocity.Z) < threshold);
+            }
+        }
+
         #endregion
 
         public LLUUID ObjectOwner
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index ac22b42..4d11dfb 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -176,17 +176,6 @@ namespace OpenSim.DataStore.MonoSqlite
             }
         }
 
-        private bool Stopped(SceneObjectPart prim)
-        {
-            double threshold = 0.02;
-            return (Math.Abs(prim.Velocity.X) < threshold &&
-                    Math.Abs(prim.Velocity.Y) < threshold &&
-                    Math.Abs(prim.Velocity.Z) < threshold &&
-                    Math.Abs(prim.AngularVelocity.X) < threshold &&
-                    Math.Abs(prim.AngularVelocity.Y) < threshold &&
-                    Math.Abs(prim.AngularVelocity.Z) < threshold);
-        }
-
         public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
         {
             lock (ds)
@@ -198,7 +187,7 @@ namespace OpenSim.DataStore.MonoSqlite
                         MainLog.Instance.Verbose("DATASTORE", "Adding obj: " + obj.UUID + " to region: " + regionUUID);
                         addPrim(prim, Util.ToRawUuidString(obj.UUID), Util.ToRawUuidString(regionUUID));
                     }
-                    else if (Stopped(prim))
+                    else if (prim.Stopped)
                     {
                         MainLog.Instance.Verbose("DATASTORE",
                                                  "Adding stopped obj: " + obj.UUID + " to region: " + regionUUID);