diff options
author | Melanie | 2012-11-01 15:52:32 +0000 |
---|---|---|
committer | Melanie | 2012-11-01 15:52:32 +0000 |
commit | e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081 (patch) | |
tree | 105184438f58ba43388aa285e456dfd5ff87fdcd /OpenSim | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Comment out checks not to overwrite existing IAR/OAR files for now on "save i... (diff) | |
download | opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.zip opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.gz opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.bz2 opensim-SC_OLD-e7a6328ea40bbbc5dba50ca21ec4e9e2c7283081.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
4 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index a32afd5..765b960 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 | |||
210 | Guid id, string firstName, string lastName, string invPath, string pass, string savePath, | 210 | Guid id, string firstName, string lastName, string invPath, string pass, string savePath, |
211 | Dictionary<string, object> options) | 211 | Dictionary<string, object> options) |
212 | { | 212 | { |
213 | if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath)) | 213 | // if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath)) |
214 | return false; | 214 | // return false; |
215 | 215 | ||
216 | if (m_scenes.Count > 0) | 216 | if (m_scenes.Count > 0) |
217 | { | 217 | { |
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 | |||
158 | else | 158 | else |
159 | path = DEFAULT_OAR_BACKUP_FILENAME; | 159 | path = DEFAULT_OAR_BACKUP_FILENAME; |
160 | 160 | ||
161 | if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path)) | 161 | // Not doing this right now as this causes some problems with auto-backup systems. Maybe a force flag is |
162 | return; | 162 | // needed |
163 | // if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, path)) | ||
164 | // return; | ||
163 | 165 | ||
164 | ArchiveRegion(path, options); | 166 | ArchiveRegion(path, options); |
165 | } | 167 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f9c7935..e2be79a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -532,7 +532,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
532 | { | 532 | { |
533 | if (PhysicsActor != null) | 533 | if (PhysicsActor != null) |
534 | { | 534 | { |
535 | m_velocity = PhysicsActor.Velocity; | 535 | m_velocity = PhysicsActor.TargetVelocity; |
536 | 536 | ||
537 | // m_log.DebugFormat( | 537 | // m_log.DebugFormat( |
538 | // "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!", | 538 | // "[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 14f65b8..5af6373 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -340,6 +340,12 @@ namespace OpenSim.Region.Physics.Manager | |||
340 | /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity, | 340 | /// Getting this returns the velocity calculated by physics scene updates, using factors such as target velocity, |
341 | /// time to accelerate and collisions. | 341 | /// time to accelerate and collisions. |
342 | /// </remarks> | 342 | /// </remarks> |
343 | public virtual Vector3 TargetVelocity | ||
344 | { | ||
345 | get { return Velocity; } | ||
346 | set { Velocity = value; } | ||
347 | } | ||
348 | |||
343 | public abstract Vector3 Velocity { get; set; } | 349 | public abstract Vector3 Velocity { get; set; } |
344 | 350 | ||
345 | public abstract Vector3 Torque { get; set; } | 351 | public abstract Vector3 Torque { get; set; } |