From 74ef1ed36f234d93aa3d58b1602344bcb3e00d6e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 21 May 2010 19:36:39 +0100
Subject: add prim item and test asset save in save oar unit test
---
OpenSim/Framework/Serialization/TarArchiveWriter.cs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
index 0bd639f..fca909f 100644
--- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs
+++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
@@ -28,7 +28,9 @@
using System;
using System.Collections.Generic;
using System.IO;
+using System.Reflection;
using System.Text;
+using log4net;
namespace OpenSim.Framework.Serialization
{
@@ -37,7 +39,7 @@ namespace OpenSim.Framework.Serialization
///
public class TarArchiveWriter
{
- //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
@@ -148,6 +150,9 @@ namespace OpenSim.Framework.Serialization
///
protected void WriteEntry(string filePath, byte[] data, char fileType)
{
+// m_log.DebugFormat(
+// "[TAR ARCHIVE WRITER]: Data for {0} is {1} bytes", filePath, (null == data ? "null" : data.Length.ToString()));
+
byte[] header = new byte[512];
// file path field (100)
--
cgit v1.1
From 721c1085da22229f4d40529dd2738a2cf62a91b7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 21 May 2010 20:43:11 +0100
Subject: make oar object filename/pathname creation a helper method reused in
both tests and oar code reduction in checking is outweighed by greater test
clarity
---
.../Framework/Serialization/ArchiveConstants.cs | 33 ++++++++++++++++++++++
1 file changed, 33 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index 1cd80db..475a9de 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+using System;
using System.Collections.Generic;
using OpenMetaverse;
@@ -85,6 +86,11 @@ namespace OpenSim.Framework.Serialization
///
public const string INVENTORY_NODE_NAME_COMPONENT_SEPARATOR = "__";
+ ///
+ /// Template used for creating filenames in OpenSim Archives.
+ ///
+ public const string OAR_OBJECT_FILENAME_TEMPLATE = "{0}_{1:000}-{2:000}-{3:000}__{4}.xml";
+
///
/// Extensions used for asset types in the archive
///
@@ -139,5 +145,32 @@ namespace OpenSim.Framework.Serialization
EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "texture.tga"] = (sbyte)AssetType.TextureTGA;
EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "trashfolder.txt"] = (sbyte)AssetType.TrashFolder;
}
+
+ ///
+ /// Create the filename used to store an object in an OpenSim Archive.
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static string CreateOarObjectFilename(string objectName, UUID uuid, Vector3 pos)
+ {
+ return string.Format(
+ OAR_OBJECT_FILENAME_TEMPLATE, objectName,
+ Math.Round(pos.X), Math.Round(pos.Y), Math.Round(pos.Z),
+ uuid);
+ }
+
+ ///
+ /// Create the path used to store an object in an OpenSim Archives.
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static string CreateOarObjectPath(string objectName, UUID uuid, Vector3 pos)
+ {
+ return OBJECTS_PATH + CreateOarObjectFilename(objectName, uuid, pos);
+ }
}
}
--
cgit v1.1
From 93ef65c69055157e0b7d51e544abe5a1035f40f0 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 21 May 2010 13:55:36 -0700
Subject: * Moving all of the prioritization/reprioritization code into a new
file Prioritizer.cs * Simplified the interest management code to make it
easier to add new policies. Prioritization and reprioritization share code
paths now * Improved the distance and front back policies to always give your
avatar the highest priority
---
OpenSim/Framework/IClientAPI.cs | 21 +++++++++------------
OpenSim/Framework/ISceneEntity.cs | 1 +
2 files changed, 10 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 00681cf..f51bf71 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -458,8 +458,6 @@ namespace OpenSim.Framework
public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
public delegate void AgentFOV(IClientAPI client, float verticalAngle);
-
- public delegate double UpdatePriorityHandler(UpdatePriorityData data);
public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID);
@@ -571,17 +569,16 @@ namespace OpenSim.Framework
public float dwell;
}
- public struct UpdatePriorityData {
- private double m_priority;
- private uint m_localID;
+ public class EntityUpdate
+ {
+ public ISceneEntity Entity;
+ public PrimUpdateFlags Flags;
- public UpdatePriorityData(double priority, uint localID) {
- this.m_priority = priority;
- this.m_localID = localID;
+ public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags)
+ {
+ Entity = entity;
+ Flags = flags;
}
-
- public double priority { get { return this.m_priority; } }
- public uint localID { get { return this.m_localID; } }
}
///
@@ -1024,7 +1021,7 @@ namespace OpenSim.Framework
void SendAvatarDataImmediate(ISceneEntity avatar);
void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags);
- void ReprioritizeUpdates(UpdatePriorityHandler handler);
+ void ReprioritizeUpdates();
void FlushPrimUpdates();
void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List items,
diff --git a/OpenSim/Framework/ISceneEntity.cs b/OpenSim/Framework/ISceneEntity.cs
index fa3c514..5ac364f 100644
--- a/OpenSim/Framework/ISceneEntity.cs
+++ b/OpenSim/Framework/ISceneEntity.cs
@@ -33,5 +33,6 @@ namespace OpenSim.Framework
{
UUID UUID { get; }
uint LocalId { get; }
+ Vector3 AbsolutePosition { get; }
}
}
--
cgit v1.1