diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 27 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
2 files changed, 16 insertions, 13 deletions
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 | |||
154 | part.SitTargetOrientation = new Quaternion(0,0,0,1); | 154 | part.SitTargetOrientation = new Quaternion(0,0,0,1); |
155 | part.SitTargetPosition = new Vector3(0,0,0); | 155 | part.SitTargetPosition = new Vector3(0,0,0); |
156 | 156 | ||
157 | // Fix ownership/creator of inventory items | 157 | // Fix ownership/creator of inventory items |
158 | // Not doing so results in inventory items | 158 | // Not doing so results in inventory items |
159 | // being no copy/no mod for everyone | 159 | // being no copy/no mod for everyone |
160 | TaskInventoryDictionary inv = part.TaskInventory; | 160 | TaskInventoryDictionary inv = part.TaskInventory; |
161 | foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv) { | 161 | foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv) |
162 | if (!resolveUserUuid(kvp.Value.OwnerID)) { | 162 | { |
163 | kvp.Value.OwnerID = masterAvatarId; | 163 | if (!resolveUserUuid(kvp.Value.OwnerID)) |
164 | } | 164 | { |
165 | if (!resolveUserUuid(kvp.Value.CreatorID)) { | 165 | kvp.Value.OwnerID = masterAvatarId; |
166 | kvp.Value.CreatorID = masterAvatarId; | 166 | } |
167 | } | 167 | if (!resolveUserUuid(kvp.Value.CreatorID)) |
168 | } | 168 | { |
169 | kvp.Value.CreatorID = masterAvatarId; | ||
170 | } | ||
171 | } | ||
169 | } | 172 | } |
170 | 173 | ||
171 | if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) | 174 | 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 | |||
249 | { | 249 | { |
250 | Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0); | 250 | Vector3 a = new Vector3(m_CameraAtAxis.X, m_CameraAtAxis.Y, 0); |
251 | 251 | ||
252 | if(a == Vector3.Zero) | 252 | if (a == Vector3.Zero) |
253 | return a; | 253 | return a; |
254 | 254 | ||
255 | return Util.GetNormalizedVector(a); | 255 | return Util.GetNormalizedVector(a); |