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.
---
OpenSim/Framework/PacketPool.cs | 4 +--
OpenSim/Framework/SurfaceTouchEventArgs.cs | 34 +++++++++++-----------
.../Modules/World/Archiver/ArchiveReadRequest.cs | 27 +++++++++--------
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 +-
.../Shared/Api/Implementation/LSL_Api.cs | 8 ++---
5 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 1b486aa..807403e 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -131,10 +131,10 @@ namespace OpenSim.Framework
///
public void ReturnPacket(Packet packet)
{
- if(!packetPoolEnabled)
+ if (!packetPoolEnabled)
return;
- switch(packet.Type)
+ switch (packet.Type)
{
// List pooling packets here
case PacketType.PacketAck:
diff --git a/OpenSim/Framework/SurfaceTouchEventArgs.cs b/OpenSim/Framework/SurfaceTouchEventArgs.cs
index f34d8ba..1fc83c2 100644
--- a/OpenSim/Framework/SurfaceTouchEventArgs.cs
+++ b/OpenSim/Framework/SurfaceTouchEventArgs.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
- public class SurfaceTouchEventArgs
- {
- public Vector3 Binormal;
- public int FaceIndex;
- public Vector3 Normal;
- public Vector3 Position;
- public Vector3 STCoord;
- public Vector3 UVCoord;
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ public class SurfaceTouchEventArgs
+ {
+ public Vector3 Binormal;
+ public int FaceIndex;
+ public Vector3 Normal;
+ public Vector3 Position;
+ public Vector3 STCoord;
+ public Vector3 UVCoord;
+ }
+}
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);
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
// now send to all (non-child) agents
List agents = World.GetAvatars();
- foreach(ScenePresence agent in agents)
+ foreach (ScenePresence agent in agents)
{
agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
landData.MediaID,
@@ -7377,7 +7377,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1); // TODO do some LOOP logic here
}
}
- else if(!presence.IsChildAgent)
+ else if (!presence.IsChildAgent)
{
// we only send to one (root) agent
presence.ControllingClient.SendParcelMediaUpdate(url,
@@ -7397,14 +7397,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
// send to all (non-child) agents
List agents = World.GetAvatars();
- foreach(ScenePresence agent in agents)
+ foreach (ScenePresence agent in agents)
{
agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
(ParcelMediaCommandEnum)commandToSend,
time);
}
}
- else if(!presence.IsChildAgent)
+ else if (!presence.IsChildAgent)
{
presence.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
(ParcelMediaCommandEnum)commandToSend,
--
cgit v1.1