From fdec8390c15ceddb56002d4d8daa2411d2e42fb7 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 12 Oct 2008 03:16:49 +0000 Subject: Update svn properties, minor formatting cleanup. --- .../Modules/World/Archiver/ArchiveReadRequest.cs | 27 ++++++++++++---------- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 88e1d24..b001b42 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs @@ -154,18 +154,21 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver part.SitTargetOrientation = new Quaternion(0,0,0,1); part.SitTargetPosition = new Vector3(0,0,0); - // Fix ownership/creator of inventory items - // Not doing so results in inventory items - // being no copy/no mod for everyone - TaskInventoryDictionary inv = part.TaskInventory; - foreach (KeyValuePair kvp in inv) { - if (!resolveUserUuid(kvp.Value.OwnerID)) { - kvp.Value.OwnerID = masterAvatarId; - } - if (!resolveUserUuid(kvp.Value.CreatorID)) { - kvp.Value.CreatorID = masterAvatarId; - } - } + // Fix ownership/creator of inventory items + // Not doing so results in inventory items + // being no copy/no mod for everyone + TaskInventoryDictionary inv = part.TaskInventory; + foreach (KeyValuePair kvp in inv) + { + if (!resolveUserUuid(kvp.Value.OwnerID)) + { + kvp.Value.OwnerID = masterAvatarId; + } + if (!resolveUserUuid(kvp.Value.CreatorID)) + { + kvp.Value.CreatorID = masterAvatarId; + } + } } if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 1d122d2..8120c62 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes { Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0); - if(a == Vector3.Zero) + if (a == Vector3.Zero) return a; return Util.GetNormalizedVector(a); -- cgit v1.1