From 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 16 Sep 2009 15:45:40 -0700
Subject: * Adding Scale to EntityBase * Fixing the incorrect initialization of
EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added
overrides for Scale/Rotation/Velocity
---
OpenSim/Region/Framework/Scenes/EntityBase.cs | 18 ++++++++-----
OpenSim/Region/Framework/Scenes/Scene.cs | 4 +--
.../Region/Framework/Scenes/SceneObjectGroup.cs | 30 +++++++++++++++++-----
3 files changed, 36 insertions(+), 16 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 00c99c5..3ef4144 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes
set { m_velocity = value; }
}
- protected Quaternion m_rotation = new Quaternion(0f, 0f, 1f, 0f);
+ protected Quaternion m_rotation;
public virtual Quaternion Rotation
{
@@ -102,6 +102,14 @@ namespace OpenSim.Region.Framework.Scenes
set { m_rotation = value; }
}
+ protected Vector3 m_scale;
+
+ public virtual Vector3 Scale
+ {
+ get { return m_scale; }
+ set { m_scale = value; }
+ }
+
protected uint m_localId;
public virtual uint LocalId
@@ -115,13 +123,9 @@ namespace OpenSim.Region.Framework.Scenes
///
public EntityBase()
{
- m_uuid = UUID.Zero;
-
- m_pos = Vector3.Zero;
- m_velocity = Vector3.Zero;
- Rotation = Quaternion.Identity;
+ m_rotation = Quaternion.Identity;
+ m_scale = Vector3.One;
m_name = "(basic entity)";
- m_rotationalvelocity = Vector3.Zero;
}
///
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d8478a2..5b3062b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2296,8 +2296,8 @@ namespace OpenSim.Region.Framework.Scenes
"to avatar {0} at position {1}",
sp.UUID.ToString(), grp.AbsolutePosition);
AttachObject(sp.ControllingClient,
- grp.LocalId, (uint)0,
- grp.GroupRotation,
+ grp.LocalId, 0,
+ grp.Rotation,
grp.AbsolutePosition, false);
RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
grp.SendGroupFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3c17bbe..0cf08b5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -204,9 +204,22 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_parts.Count; }
}
- public Quaternion GroupRotation
+ public override Quaternion Rotation
{
get { return m_rootPart.RotationOffset; }
+ set { m_rootPart.RotationOffset = value; }
+ }
+
+ public override Vector3 Scale
+ {
+ get { return m_rootPart.Scale; }
+ set { m_rootPart.Scale = value; }
+ }
+
+ public override Vector3 Velocity
+ {
+ get { return m_rootPart.Velocity; }
+ set { m_rootPart.Velocity = value; }
}
public UUID GroupID
@@ -523,7 +536,7 @@ namespace OpenSim.Region.Framework.Scenes
// Temporary commented to stop compiler warning
//Vector3 partPosition =
// new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z);
- Quaternion parentrotation = GroupRotation;
+ Quaternion parentrotation = Rotation;
// Telling the prim to raytrace.
//EntityIntersection inter = part.TestIntersection(hRay, parentrotation);
@@ -1866,14 +1879,17 @@ namespace OpenSim.Region.Framework.Scenes
checkAtTargets();
- if (UsePhysics && ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1)
- || (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1)
- || (Math.Abs(lastPhysGroupRot.Y - GroupRotation.Y) > 0.1)
- || (Math.Abs(lastPhysGroupRot.Z - GroupRotation.Z) > 0.1)))
+ Quaternion rot = Rotation;
+
+ if (UsePhysics &&
+ ((Math.Abs(lastPhysGroupRot.W - rot.W) > 0.1f)
+ || (Math.Abs(lastPhysGroupRot.X - rot.X) > 0.1f)
+ || (Math.Abs(lastPhysGroupRot.Y - rot.Y) > 0.1f)
+ || (Math.Abs(lastPhysGroupRot.Z - rot.Z) > 0.1f)))
{
m_rootPart.UpdateFlag = 1;
- lastPhysGroupRot = GroupRotation;
+ lastPhysGroupRot = rot;
}
foreach (SceneObjectPart part in m_parts.Values)
--
cgit v1.1
From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 1 Oct 2009 01:00:09 +0900
Subject: Formatting cleanup.
---
.../Scenes/AsyncSceneObjectGroupDeleter.cs | 22 ++++++++++----------
.../Region/Framework/Scenes/AvatarAnimations.cs | 2 +-
OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs | 6 +++---
OpenSim/Region/Framework/Scenes/EntityManager.cs | 2 +-
OpenSim/Region/Framework/Scenes/EventManager.cs | 4 ++--
.../Hypergrid/HGSceneCommunicationService.cs | 2 +-
.../Region/Framework/Scenes/RegionStatsHandler.cs | 6 +++---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +-
.../Framework/Scenes/Scene.PacketHandlers.cs | 14 ++++++-------
.../Region/Framework/Scenes/Scene.Permissions.cs | 16 +++++++--------
OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++----
OpenSim/Region/Framework/Scenes/SceneBase.cs | 8 ++++----
OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneManager.cs | 12 +++++------
.../Region/Framework/Scenes/SceneObjectGroup.cs | 24 +++++++++++-----------
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 18 ++++++++--------
.../Framework/Scenes/SceneObjectPartInventory.cs | 4 ++--
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 ++++++-------
.../Scenes/Serialization/SceneObjectSerializer.cs | 16 +++++++--------
.../Scenes/Serialization/SceneXmlLoader.cs | 2 +-
.../Region/Framework/Scenes/SimStatsReporter.cs | 2 +-
.../Framework/Scenes/Tests/EntityManagerTests.cs | 14 ++++++-------
.../Scenes/Tests/SceneObjectBasicTests.cs | 16 +++++++--------
.../Scenes/Tests/SceneObjectLinkingTests.cs | 12 +++++------
.../Region/Framework/Scenes/Tests/SceneTests.cs | 4 ++--
.../Scenes/Tests/StandaloneTeleportTests.cs | 4 ++--
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 12 +++++------
27 files changed, 124 insertions(+), 124 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 7ac1e7e..5b571c7 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Region.Framework.Scenes
-{
+{
class DeleteToInventoryHolder
{
public DeRezAction action;
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
/// up the main client thread.
///
public class AsyncSceneObjectGroupDeleter
- {
+ {
private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -58,16 +58,16 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool Enabled;
- private Timer m_inventoryTicker = new Timer(2000);
- private readonly Queue m_inventoryDeletes = new Queue();
- private Scene m_scene;
+ private Timer m_inventoryTicker = new Timer(2000);
+ private readonly Queue m_inventoryDeletes = new Queue();
+ private Scene m_scene;
public AsyncSceneObjectGroupDeleter(Scene scene)
{
m_scene = scene;
m_inventoryTicker.AutoReset = false;
- m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;
+ m_inventoryTicker.Elapsed += InventoryRunDeleteTimer;
}
///
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes
{
//m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing...");
}
- }
+ }
///
/// Move the next object in the queue to inventory. Then delete it properly from the scene.
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool InventoryDeQueueAndDelete()
{
- DeleteToInventoryHolder x = null;
+ DeleteToInventoryHolder x = null;
try
{
@@ -142,9 +142,9 @@ namespace OpenSim.Region.Framework.Scenes
try
{
- m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);
+ m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);
if (x.permissionToDelete)
- m_scene.DeleteSceneObject(x.objectGroup, false);
+ m_scene.DeleteSceneObject(x.objectGroup, false);
}
catch (Exception e)
{
@@ -166,6 +166,6 @@ namespace OpenSim.Region.Framework.Scenes
m_log.Debug("[SCENE]: No objects left in inventory send queue.");
return false;
- }
+ }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
index 06b1d22..72d599a 100644
--- a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (nod.Attributes["name"] != null)
{
- string name = (string)nod.Attributes["name"].Value;
+ string name = (string)nod.Attributes["name"].Value;
UUID id = (UUID)nod.InnerText;
string animState = (string)nod.Attributes["state"].Value;
diff --git a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
index 1dd9613..5f2eb0d 100644
--- a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
+++ b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Framework.Scenes
///
- /// Variable length strings seem to be null terminated in the animation asset.. but..
+ /// Variable length strings seem to be null terminated in the animation asset.. but..
/// use with caution, home grown.
/// advances the index.
///
@@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes
byte[] interm = new byte[endpos-i];
for (; iZXY
t = y;
y = z;
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 504b90a..0ceef39 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.ErrorFormat("Remove Entity failed for {0}", localID, e);
return false;
- }
+ }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 7424b24..753344d 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -290,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Guid.Empty is returned.
///
public delegate void OarFileSaved(Guid guid, string message);
- public event OarFileSaved OnOarFileSaved;
+ public event OarFileSaved OnOarFileSaved;
///
/// Called when the script compile queue becomes empty
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes
handlerOarFileSaved = OnOarFileSaved;
if (handlerOarFileSaved != null)
handlerOarFileSaved(requestId, message);
- }
+ }
public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message)
{
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 1217f9b..d7e62a8 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -357,7 +357,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
m_log.DebugFormat(
"[HGSceneCommService]: User {0} is going to another region, profile cache removed",
- avatar.UUID);
+ avatar.UUID);
}
}
else
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index 7c02f9a..73f918e 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes
public class RegionStatsHandler : IStreamedRequestHandler
- {
+ {
private string osRXStatsURI = String.Empty;
private string osXStatsURI = String.Empty;
//private string osSecret = String.Empty;
@@ -87,13 +87,13 @@ namespace OpenSim.Region.Framework.Scenes
}
public string Path
- {
+ {
// This is for the region and is the regionSecret hashed
get { return "/" + osRXStatsURI + "/"; }
}
private string Report()
- {
+ {
OSDMap args = new OSDMap(30);
//int time = Util.ToUnixTime(DateTime.Now);
args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index eb397f6..a4460e4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes
return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId);
}
else
- {
+ {
InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId);
if (agentItem == null)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index fddba86..6c9856d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -413,7 +413,7 @@ namespace OpenSim.Region.Framework.Scenes
remoteClient.SendInventoryItemDetails(ownerID, item);
}
// else shouldn't we send an alert message?
- }
+ }
///
/// Tell the client about the various child items and folders contained in the requested folder.
@@ -485,7 +485,7 @@ namespace OpenSim.Region.Framework.Scenes
// TODO: This code for looking in the folder for the library should be folded back into the
// CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
- // can be handled transparently).
+ // can be handled transparently).
InventoryFolderImpl fold;
if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null)
{
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Framework.Scenes
return contents;
- }
+ }
///
/// Handle an inventory folder creation request from the client.
@@ -535,7 +535,7 @@ namespace OpenSim.Region.Framework.Scenes
"[AGENT INVENTORY]: Failed to move create folder for user {0} {1}",
remoteClient.Name, remoteClient.AgentId);
}
- }
+ }
///
/// Handle a client request to update the inventory folder
@@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes
remoteClient.Name, remoteClient.AgentId);
}
}
- }
+ }
public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID)
{
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.WarnFormat("[AGENT INVENTORY]: request to move folder {0} but folder not found", folderID);
}
- }
+ }
///
/// This should delete all the items and folders in the given directory.
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.WarnFormat("[AGENT INVENTORY]: Exception on purge folder for user {0}: {1}", remoteClient.AgentId, e.Message);
}
- }
+ }
private void PurgeFolderAsync(UUID userID, UUID folderID)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 226ec15..d01cef7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- ///
+ ///
public bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID)
{
CreateObjectInventoryHandler handler = OnCreateObjectInventory;
@@ -856,7 +856,7 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- ///
+ ///
public bool CanCreateUserInventory(int invType, UUID userID)
{
CreateUserInventoryHandler handler = OnCreateUserInventory;
@@ -877,7 +877,7 @@ namespace OpenSim.Region.Framework.Scenes
///
///
///
- ///
+ ///
public bool CanEditUserInventory(UUID itemID, UUID userID)
{
EditUserInventoryHandler handler = OnEditUserInventory;
@@ -891,14 +891,14 @@ namespace OpenSim.Region.Framework.Scenes
}
}
return true;
- }
+ }
///
/// Check whether the specified user is allowed to copy the given inventory item from their own inventory.
///
///
///
- ///
+ ///
public bool CanCopyUserInventory(UUID itemID, UUID userID)
{
CopyUserInventoryHandler handler = OnCopyUserInventory;
@@ -912,14 +912,14 @@ namespace OpenSim.Region.Framework.Scenes
}
}
return true;
- }
+ }
///
/// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
///
///
///
- ///
+ ///
public bool CanDeleteUserInventory(UUID itemID, UUID userID)
{
DeleteUserInventoryHandler handler = OnDeleteUserInventory;
@@ -933,7 +933,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
return true;
- }
+ }
public bool CanTeleport(UUID userID)
{
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 39f3007..f8db354 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -996,7 +996,7 @@ namespace OpenSim.Region.Framework.Scenes
// Loop it
if (m_frame == Int32.MaxValue)
- m_frame = 0;
+ m_frame = 0;
otherMS = Environment.TickCount;
// run through all entities looking for updates (slow)
@@ -2023,12 +2023,12 @@ namespace OpenSim.Region.Framework.Scenes
return true;
}
break;
- case Cardinals.W:
+ case Cardinals.W:
foreach (Border b in WestBorders)
{
if (b.TestCross(position))
return true;
- }
+ }
break;
}
}
@@ -3270,7 +3270,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region",
agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
//reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName);
- return false;
+ return false;
}
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 2af98cc..0ac4ed4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Registered classes that are capable of creating entities.
///
- protected Dictionary m_entityCreators = new Dictionary();
+ protected Dictionary m_entityCreators = new Dictionary();
///
/// The last allocated local prim id. When a new local id is requested, the next number in the sequence is
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes
_primAllocateMutex.ReleaseMutex();
return myID;
- }
+ }
#region Module Methods
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Shows various details about the sim based on the parameters supplied by the console command in openSimMain.
///
- /// What to show
+ /// What to show
public virtual void Show(string[] showParams)
{
switch (showParams[0])
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes
}
break;
}
- }
+ }
public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback)
{
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0c471aa..54ac792 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence sp;
lock (ScenePresences)
- {
+ {
ScenePresences.TryGetValue(agentID, out sp);
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 0019b23..1d4efd0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SaveCurrentSceneToXml(string filename)
{
IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface();
- if (serialiser != null)
+ if (serialiser != null)
serialiser.SavePrimsToXml(CurrentOrFirstScene, filename);
}
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Framework.Scenes
public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset)
{
IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface();
- if (serialiser != null)
+ if (serialiser != null)
serialiser.LoadPrimsFromXml(CurrentOrFirstScene, filename, generateNewIDs, loadOffset);
}
@@ -216,14 +216,14 @@ namespace OpenSim.Region.Framework.Scenes
public void SaveCurrentSceneToXml2(string filename)
{
IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface();
- if (serialiser != null)
+ if (serialiser != null)
serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename);
}
public void SaveNamedPrimsToXml2(string primName, string filename)
{
IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface();
- if (serialiser != null)
+ if (serialiser != null)
serialiser.SaveNamedPrimsToXml2(CurrentOrFirstScene, primName, filename);
}
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Framework.Scenes
public void LoadCurrentSceneFromXml2(string filename)
{
IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface();
- if (serialiser != null)
+ if (serialiser != null)
serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename);
}
@@ -257,7 +257,7 @@ namespace OpenSim.Region.Framework.Scenes
public void LoadArchiveToCurrentScene(string filename)
{
IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface();
- if (archiver != null)
+ if (archiver != null)
archiver.DearchiveRegion(filename);
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ad5d56f..5c0024f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -263,7 +263,7 @@ namespace OpenSim.Region.Framework.Scenes
if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
|| m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S))
&& !IsAttachmentCheckFull())
- {
+ {
m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
}
@@ -454,7 +454,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public void AttachToScene(Scene scene)
{
- m_scene = scene;
+ m_scene = scene;
RegionHandle = m_scene.RegionInfo.RegionHandle;
if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0)
@@ -479,9 +479,9 @@ namespace OpenSim.Region.Framework.Scenes
//m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
}
- ApplyPhysics(m_scene.m_physicalPrim);
+ ApplyPhysics(m_scene.m_physicalPrim);
- ScheduleGroupForFullUpdate();
+ ScheduleGroupForFullUpdate();
}
public Vector3 GroupScale()
@@ -1037,12 +1037,12 @@ namespace OpenSim.Region.Framework.Scenes
m_rootPart = part;
if (!IsAttachment)
part.ParentID = 0;
- part.LinkNum = 0;
+ part.LinkNum = 0;
// No locking required since the SOG should not be in the scene yet - one can't change root parts after
// the scene object has been attached to the scene
m_parts.Add(m_rootPart.UUID, m_rootPart);
- }
+ }
///
/// Add a new part to this scene object. The part must already be correctly configured.
@@ -1160,7 +1160,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Delete this group from its scene and tell all the scene presences about that deletion.
- ///
+ ///
/// Broadcast deletions to all clients.
public void DeleteGroup(bool silent)
{
@@ -1267,11 +1267,11 @@ namespace OpenSim.Region.Framework.Scenes
if (part.LocalId != m_rootPart.LocalId)
{
part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
- }
- }
+ }
+ }
// Hack to get the physics scene geometries in the right spot
- ResetChildPrimPhysicsPositions();
+ ResetChildPrimPhysicsPositions();
}
else
{
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Framework.Scenes
List partList;
lock (m_parts)
- {
+ {
partList = new List(m_parts.Values);
}
@@ -1744,7 +1744,7 @@ namespace OpenSim.Region.Framework.Scenes
rootpart.PhysActor.PIDHoverActive = false;
}
}
- }
+ }
}
///
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index cce45fe..c915e9f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Scenes.Scripting;
using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.Framework.Scenes
-{
+{
#region Enumerations
[Flags]
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes
public IEntityInventory Inventory
{
get { return m_inventory; }
- }
+ }
protected SceneObjectPartInventory m_inventory;
[XmlIgnore]
@@ -309,9 +309,9 @@ namespace OpenSim.Region.Framework.Scenes
RotationOffset = rotationOffset;
Velocity = new Vector3(0, 0, 0);
AngularVelocity = new Vector3(0, 0, 0);
- Acceleration = new Vector3(0, 0, 0);
+ Acceleration = new Vector3(0, 0, 0);
m_TextureAnimation = new byte[0];
- m_particleSystem = new byte[0];
+ m_particleSystem = new byte[0];
// Prims currently only contain a single folder (Contents). From looking at the Second Life protocol,
// this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes
- ///
+ ///
public TaskInventoryDictionary TaskInventory
{
get { return m_inventory.Items; }
@@ -3484,7 +3484,7 @@ if (m_shape != null) {
}
else // it already has a physical representation
{
- pa.IsPhysical = UsePhysics;
+ pa.IsPhysical = UsePhysics;
DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim
if (m_parentGroup != null)
@@ -3775,7 +3775,7 @@ if (m_shape != null) {
public override string ToString()
{
return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup);
- }
+ }
#endregion Public Methods
@@ -3823,11 +3823,11 @@ if (m_shape != null) {
_everyoneMask &= _nextOwnerMask;
Inventory.ApplyNextOwnerPermissions();
- }
+ }
public bool CanBeDeleted()
{
return Inventory.CanBeDeleted();
}
- }
+ }
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 76bcd7e..098e010 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes
public void ForceInventoryPersistence()
{
HasInventoryChanged = true;
- }
+ }
///
/// Reset UUIDs for all the items in the prim's inventory. This involves either generating
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Change every item in this inventory to a new group.
///
- ///
+ ///
public void ChangeInventoryGroup(UUID groupID)
{
lock (Items)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 286b7ca..0e1b8d9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes
// Moved this from SendInitialData to ensure that m_appearance is initialized
// before the inventory is processed in MakeRootAgent. This fixes a race condition
// related to the handling of attachments
- //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
+ //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance);
if (m_scene.TestBorderCross(pos, Cardinals.E))
{
Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
@@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes
if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
{
StandUp();
- }
+ }
// Check if Client has camera in 'follow cam' or 'build' mode.
Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation);
@@ -1489,7 +1489,7 @@ namespace OpenSim.Region.Framework.Scenes
{
// m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
// m_log.DebugFormat(
-// "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
+// "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
AddNewMovement(agent_control_v3, q);
@@ -2306,7 +2306,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Rotate the avatar to the given rotation and apply a movement in the given relative vector
///
/// The vector in which to move. This is relative to the rotation argument
- /// The direction in which this avatar should now face.
+ /// The direction in which this avatar should now face.
public void AddNewMovement(Vector3 vec, Quaternion rotation)
{
if (m_isChildAgent)
@@ -2649,7 +2649,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Tell the client for this scene presence what items it should be wearing now
///
public void SendWearables()
- {
+ {
ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
}
@@ -3175,7 +3175,7 @@ namespace OpenSim.Region.Framework.Scenes
else
{
wears[i++] = UUID.Zero;
- wears[i++] = UUID.Zero;
+ wears[i++] = UUID.Zero;
}
}
cAgent.Wearables = wears;
@@ -3487,7 +3487,7 @@ namespace OpenSim.Region.Framework.Scenes
public bool HasAttachments()
{
- return m_attachments.Count > 0;
+ return m_attachments.Count > 0;
}
public bool HasScriptedAttachments()
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index fe74158..f7544ac 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -122,13 +122,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
"[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData);
return null;
}
- }
+ }
///
/// Serialize a scene object to the original xml format
///
///
- ///
+ ///
public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject)
{
using (StringWriter sw = new StringWriter())
@@ -140,13 +140,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
return sw.ToString();
}
- }
+ }
///
/// Serialize a scene object to the original xml format
///
///
- ///
+ ///
public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer)
{
//m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name);
@@ -238,13 +238,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData);
return null;
}
- }
+ }
///
/// Serialize a scene object to the 'xml2' format.
///
///
- ///
+ ///
public static string ToXml2Format(SceneObjectGroup sceneObject)
{
using (StringWriter sw = new StringWriter())
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
/// Serialize a scene object to the 'xml2' format.
///
///
- ///
+ ///
public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer)
{
//m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name);
@@ -288,6 +288,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
writer.WriteEndElement(); // End of SceneObjectGroup
//m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time);
- }
+ }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 7fa1b8c..cf0f345 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
}
SavePrimListToXml2(primList, fileName);
- }
+ }
public static void SavePrimListToXml2(List entityList, string fileName)
{
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 7f44bf1..ee288b3 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Framework.Scenes
{
addFrameMS(ms);
addAgentMS(ms);
- }
+ }
#endregion
}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index 3b0e77f..fc66c85 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
[TestFixture, LongRunning]
public class EntityManagerTests
- {
+ {
static public Random random;
SceneObjectGroup found;
Scene scene = SceneSetupHelpers.SetupScene();
@@ -81,13 +81,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Assert.That(entman.ContainsKey(obj1), Is.False);
Assert.That(entman.ContainsKey(li1), Is.False);
- Assert.That(entman.ContainsKey(obj2), Is.False);
- Assert.That(entman.ContainsKey(li2), Is.False);
+ Assert.That(entman.ContainsKey(obj2), Is.False);
+ Assert.That(entman.ContainsKey(li2), Is.False);
}
[Test]
public void T011_ThreadAddRemoveTest()
- {
+ {
TestHelper.InMethod();
// Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod());
@@ -148,12 +148,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
int size = random.Next(40,80);
char ch ;
for (int i=0; i
[TestFixture]
public class SceneObjectBasicTests
- {
+ {
///
/// Test adding an object to a scene.
///
[Test, LongRunning]
public void TestAddSceneObject()
- {
+ {
TestHelper.InMethod();
Scene scene = SceneSetupHelpers.SetupScene();
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
//m_log.Debug("retrievedPart : {0}", retrievedPart);
// If the parts have the same UUID then we will consider them as one and the same
- Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
+ Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
}
///
@@ -72,11 +72,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneSetupHelpers.SetupScene();
SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
scene.DeleteSceneObject(part.ParentGroup, false);
- SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+ SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
Assert.That(retrievedPart, Is.Null);
}
@@ -115,13 +115,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
//[Test]
//public void TestDeleteSceneObjectAsyncToUserInventory()
//{
- // TestHelper.InMethod();
- // //log4net.Config.XmlConfigurator.Configure();
+ // TestHelper.InMethod();
+ // //log4net.Config.XmlConfigurator.Configure();
// UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
// string myObjectName = "Fred";
- // TestScene scene = SceneSetupHelpers.SetupScene();
+ // TestScene scene = SceneSetupHelpers.SetupScene();
// SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName);
// Assert.That(
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index bf13607..e15dc84 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
///
/// Linking tests
///
- [TestFixture]
+ [TestFixture]
public class SceneObjectLinkingTests
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -174,13 +174,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Link grp4 to grp3.
grp3.LinkToGroup(grp4);
- // At this point we should have 4 parts total in two groups.
+ // At this point we should have 4 parts total in two groups.
Assert.That(grp1.Children.Count == 2);
Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
- Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");
+ Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink.");
Assert.That(grp3.Children.Count == 2);
Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
- Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");
+ Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink.");
if (debugtest)
{
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation);
m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset);
m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset);
- }
+ }
// Required for linking
grp1.RootPart.UpdateFlag = 0;
@@ -253,6 +253,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
&& (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003)
&& (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003)
&& (part4.RotationOffset.W - compareQuaternion.W < 0.00003));
- }
+ }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 1c9bce4..8a27b7b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -41,11 +41,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public class SceneTests
{
private class FakeStorageManager : StorageManager
- {
+ {
private class FakeRegionDataStore : IRegionDataStore
{
public void Initialise(string filename)
- {
+ {
}
public void Dispose()
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 751c1cd..b46eb8e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
///
/// Teleport tests in a standalone OpenSim
- ///
+ ///
[TestFixture]
public class StandaloneTeleportTests
{
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
///
/// Does not yet do what is says on the tin.
/// Commenting for now
- //[Test, LongRunning]
+ //[Test, LongRunning]
public void TestSimpleNotNeighboursTeleport()
{
TestHelper.InMethod();
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index f449e18..525a93a 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes
{
///
/// Gather uuids for a given entity.
- ///
+ ///
///
/// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts
/// contained in inventory, as scripts contained in objects contained in another object's inventory, etc. Assets
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// The uuid of the asset for which to gather referenced assets
/// The type of the asset for the uuid given
- /// The assets gathered
+ /// The assets gathered
public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary assetUuids)
{
assetUuids[assetUuid] = 1;
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
// If the prim is a sculpt then preserve this information too
if (part.Shape.SculptTexture != UUID.Zero)
- assetUuids[part.Shape.SculptTexture] = 1;
+ assetUuids[part.Shape.SculptTexture] = 1;
TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// The callback made when we request the asset for an object from the asset service.
- ///
+ ///
protected void AssetReceived(string id, Object sender, AssetBase asset)
{
lock (this)
@@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes
AssetBase assetBase = GetAsset(wearableAssetUuid);
if (null != assetBase)
- {
+ {
//m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data));
AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data);
wearableAsset.Decode();
@@ -275,6 +275,6 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
GatherAssetUuids(sog, assetUuids);
}
- }
+ }
}
}
\ No newline at end of file
--
cgit v1.1
From 606e831ff5337fb5e94dcebf9d6852bd4c434d4b Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 1 Oct 2009 09:38:36 +0900
Subject: Formatting cleanup.
---
OpenSim/Region/Framework/Scenes/Border.cs | 8 ++++----
OpenSim/Region/Framework/Scenes/EntityBase.cs | 2 +-
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 2 +-
OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index 1488c5b..c6a6511 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -55,11 +55,11 @@ namespace OpenSim.Region.Framework.Scenes
/// Creates a Border. The line is perpendicular to the direction cardinal.
/// IE: if the direction cardinal is South, the line is West->East
///
- /// The starting point for the line of the border.
- /// The position of an object must be greater then this for this border to trigger.
+ /// The starting point for the line of the border.
+ /// The position of an object must be greater then this for this border to trigger.
/// Perpendicular to the direction cardinal
- /// The ending point for the line of the border.
- /// The position of an object must be less then this for this border to trigger.
+ /// The ending point for the line of the border.
+ /// The position of an object must be less then this for this border to trigger.
/// Perpendicular to the direction cardinal
/// The position that triggers border the border
/// cross parallel to the direction cardinal. On the North cardinal, this
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 00c99c5..c2ec6a5 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Framework.Scenes
public abstract void UpdateMovement();
///
- /// Performs any updates that need to be done at each frame, as opposed to immediately.
+ /// Performs any updates that need to be done at each frame, as opposed to immediately.
/// These included scheduled updates and updates that occur due to physics processing.
///
public abstract void Update();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 6c9856d..e561efb 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -544,7 +544,7 @@ namespace OpenSim.Region.Framework.Scenes
/// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE
/// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing,
/// and needs to be changed.
- ///
+ ///
///
///
///
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f8db354..05a6f13 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3419,7 +3419,7 @@ namespace OpenSim.Region.Framework.Scenes
/// We've got an update about an agent that sees into this region,
/// send it to ScenePresence for processing It's the full data.
///
- /// Agent that contains all of the relevant things about an agent.
+ /// Agent that contains all of the relevant things about an agent.
/// Appearance, animations, position, etc.
/// true if we handled it.
public virtual bool IncomingChildAgentDataUpdate(AgentData cAgentData)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5c0024f..25489d8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Is this scene object acting as an attachment?
///
/// We return false if the group has already been deleted.
- ///
+ ///
/// TODO: At the moment set must be done on the part itself. There may be a case for doing it here since I
/// presume either all or no parts in a linkset can be part of an attachment (in which
/// case the value would get proprogated down into all the descendent parts).
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c915e9f..ea6bc9c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes
public UUID FromItemID = UUID.Zero;
///
- /// The UUID of the user inventory item from which this object was rezzed if this is a root part.
+ /// The UUID of the user inventory item from which this object was rezzed if this is a root part.
/// If UUID.Zero then either this is not a root part or there is no connection with a user inventory item.
///
private UUID m_fromUserInventoryItemID = UUID.Zero;
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Framework.Scenes
///
/// A relic from when we we thought that prims contained folder objects. In
- /// reality, prim == folder
+ /// reality, prim == folder
/// Exposing this is not particularly good, but it's one of the least evils at the moment to see
/// folder id from prim inventory item data, since it's not (yet) actually stored with the prim.
///
@@ -3386,7 +3386,7 @@ if (m_shape != null) {
}
else
{
- IsPhantom = false;
+ IsPhantom = false;
// If volumedetect is active we don't want phantom to be applied.
// If this is a new call to VD out of the state "phantom"
// this will also cause the prim to be visible to physics
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0e1b8d9..66fefa3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2313,7 +2313,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.Debug("DEBUG: AddNewMovement: child agent, Making root agent!");
- // we have to reset the user's child agent connections.
+ // we have to reset the user's child agent connections.
// Likely, here they've lost the eventqueue for other regions so border
// crossings will fail at this point unless we reset them.
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 288fb36..0ed00de 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
// Assert.That(
// scene.CommsManager.UserAdminService.AddUser(
// "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
- // Is.EqualTo(agentId));
+ // Is.EqualTo(agentId));
// IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
--
cgit v1.1
From 8e3dd64282495e8f7b18efcb2a2e57218a3db6ad Mon Sep 17 00:00:00 2001
From: James J Greensky
Date: Wed, 30 Sep 2009 16:52:59 -0700
Subject: Removed an innefficent List.Contains lookup from UpdateQueue
Changed the underlying data structure used to detected duplicate
in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a
List to a Dictionary.
---
OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
index 21cda09..213e954 100644
--- a/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
+++ b/OpenSim/Region/Framework/Scenes/Types/UpdateQueue.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
{
private Queue m_queue;
- private List m_ids;
+ private Dictionary m_ids;
private object m_syncObject = new object();
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Types
public UpdateQueue()
{
m_queue = new Queue();
- m_ids = new List();
+ m_ids = new Dictionary();
}
public void Clear()
@@ -66,9 +66,8 @@ namespace OpenSim.Region.Framework.Scenes.Types
{
lock (m_syncObject)
{
- if (!m_ids.Contains(part.UUID))
- {
- m_ids.Add(part.UUID);
+ if (!m_ids.ContainsKey(part.UUID)) {
+ m_ids.Add(part.UUID, true);
m_queue.Enqueue(part);
}
}
--
cgit v1.1