From ffe4d738fbcd27e3c037693ab6812df1d9fbb977 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Wed, 31 Oct 2012 17:13:18 -0700
Subject: Add TargetVelocity to PhysicsActor interface to support distributed
 physics. No change to existing functions.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 OpenSim/Region/Physics/Manager/PhysicsActor.cs   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 71e322d..5f2a6b1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -523,7 +523,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (PhysicsActor != null)
                 {
-                    m_velocity = PhysicsActor.Velocity;
+                    m_velocity = PhysicsActor.TargetVelocity;
 
 //                    m_log.DebugFormat(
 //                        "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 0587054..34413e5 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -257,6 +257,12 @@ namespace OpenSim.Region.Physics.Manager
         /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity,
         /// time to accelerate and collisions.
         /// </remarks>
+        public virtual Vector3 TargetVelocity
+        {
+            get { return Velocity; }
+            set { Velocity = value; }
+        }
+
         public abstract Vector3 Velocity { get; set; }
 
         public abstract Vector3 Torque { get; set; }
-- 
cgit v1.1


From ccb17eab714428e5bcfab91a20203a23f84bc21e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Nov 2012 03:31:30 +0000
Subject: Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a
 32-bit version from libopenmetaverse commit 3731ee4

This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries.
However, the reverse is also true.
If OpenSimulator stops working for you then please complain!  Long term alternative is probably to build a fat binary with both architectures.
---
 bin/lib64/libopenjpeg-dotnet.dylib | Bin 147288 -> 130560 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib
index 18ca868..91f7264 100755
Binary files a/bin/lib64/libopenjpeg-dotnet.dylib and b/bin/lib64/libopenjpeg-dotnet.dylib differ
-- 
cgit v1.1


From 8dfe59d7b88309fdc2436abe7dda9a2fc699a427 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Nov 2012 03:42:15 +0000
Subject: Comment out checks not to overwrite existing IAR/OAR files for now on
 "save iar/oar" since this causes problems for some backup systems.

Needs more thought, maybe an explicit --force/--overwrite switch
Comments on http://opensimulator.org/mantis/view.php?id=6389
---
 .../Avatar/Inventory/Archiver/InventoryArchiverModule.cs            | 4 ++--
 OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs         | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index afe1200..fdba682 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -210,8 +210,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             Guid id, string firstName, string lastName, string invPath, string pass, string savePath,
             Dictionary<string, object> options)
         {
-            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
-                return false;
+//            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath))
+//                return false;
 
             if (m_scenes.Count > 0)
             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 970487a..abf3713 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -158,8 +158,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             else
                 path = DEFAULT_OAR_BACKUP_FILENAME;
 
-            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path))
-                return;
+            // Not doing this right now as this causes some problems with auto-backup systems.  Maybe a force flag is
+            // needed
+//            if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path))
+//                return;
 
             ArchiveRegion(path, options);
         }
-- 
cgit v1.1