diff options
Diffstat (limited to '')
3 files changed, 20 insertions, 17 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); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 447a4fb..428aeb6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7366,7 +7366,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7366 | 7366 | ||
7367 | // now send to all (non-child) agents | 7367 | // now send to all (non-child) agents |
7368 | List<ScenePresence> agents = World.GetAvatars(); | 7368 | List<ScenePresence> agents = World.GetAvatars(); |
7369 | foreach(ScenePresence agent in agents) | 7369 | foreach (ScenePresence agent in agents) |
7370 | { | 7370 | { |
7371 | agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, | 7371 | agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL, |
7372 | landData.MediaID, | 7372 | landData.MediaID, |
@@ -7377,7 +7377,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7377 | 1); // TODO do some LOOP logic here | 7377 | 1); // TODO do some LOOP logic here |
7378 | } | 7378 | } |
7379 | } | 7379 | } |
7380 | else if(!presence.IsChildAgent) | 7380 | else if (!presence.IsChildAgent) |
7381 | { | 7381 | { |
7382 | // we only send to one (root) agent | 7382 | // we only send to one (root) agent |
7383 | presence.ControllingClient.SendParcelMediaUpdate(url, | 7383 | presence.ControllingClient.SendParcelMediaUpdate(url, |
@@ -7397,14 +7397,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7397 | { | 7397 | { |
7398 | // send to all (non-child) agents | 7398 | // send to all (non-child) agents |
7399 | List<ScenePresence> agents = World.GetAvatars(); | 7399 | List<ScenePresence> agents = World.GetAvatars(); |
7400 | foreach(ScenePresence agent in agents) | 7400 | foreach (ScenePresence agent in agents) |
7401 | { | 7401 | { |
7402 | agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? | 7402 | agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? |
7403 | (ParcelMediaCommandEnum)commandToSend, | 7403 | (ParcelMediaCommandEnum)commandToSend, |
7404 | time); | 7404 | time); |
7405 | } | 7405 | } |
7406 | } | 7406 | } |
7407 | else if(!presence.IsChildAgent) | 7407 | else if (!presence.IsChildAgent) |
7408 | { | 7408 | { |
7409 | presence.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? | 7409 | presence.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this? |
7410 | (ParcelMediaCommandEnum)commandToSend, | 7410 | (ParcelMediaCommandEnum)commandToSend, |