From d381da81d6bf57f05dd3f3430de6c8c936932292 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:15:38 +0000
Subject: minor: Add method doc to IImproveAssetCache
---
OpenSim/Framework/IImprovedAssetCache.cs | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IImprovedAssetCache.cs b/OpenSim/Framework/IImprovedAssetCache.cs
index a0b8b55..a853e90 100644
--- a/OpenSim/Framework/IImprovedAssetCache.cs
+++ b/OpenSim/Framework/IImprovedAssetCache.cs
@@ -31,10 +31,34 @@ namespace OpenSim.Framework
{
public interface IImprovedAssetCache
{
+ ///
+ /// Cache the specified asset.
+ ///
+ ///
void Cache(AssetBase asset);
+
+ ///
+ /// Get an asset by its id.
+ ///
+ ///
+ /// null if the asset does not exist.
AssetBase Get(string id);
+
+ ///
+ /// Check whether an asset with the specified id exists in the cache.
+ ///
+ ///
bool Check(string id);
+
+ ///
+ /// Expire an asset from the cache.
+ ///
+ ///
void Expire(string id);
+
+ ///
+ /// Clear the cache.
+ ///
void Clear();
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From 4fb3d314b85019af0e30cf0c2e7c24e9bf32ab66 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 19 Jan 2014 07:26:55 -0800
Subject: Fix casting error for float type INI file parameter parsing.
---
OpenSim/Framework/Util.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index cebba46..7bc8176 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1031,7 +1031,7 @@ namespace OpenSim.Framework
else if (typeof(T) == typeof(Int32))
val = cnf.GetInt(varname, (int)val);
else if (typeof(T) == typeof(float))
- val = cnf.GetFloat(varname, (int)val);
+ val = cnf.GetFloat(varname, (float)val);
else
m_log.ErrorFormat("[UTIL]: Unhandled type {0}", typeof(T));
}
--
cgit v1.1
From 3018b2c5d7c9de0e8da6d158f0848c840b7864ab Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Fri, 6 Dec 2013 16:21:11 +0200
Subject: Materials module: a) Store materials as assets; b) Finalized it
(removed the "Demo" label; removed most of the logging); c) Enabled by
default
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
---
OpenSim/Framework/SLUtil.cs | 40 ++++++++++++++++++----
.../Framework/Serialization/ArchiveConstants.cs | 3 ++
2 files changed, 36 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index cb73e8f..9249105 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -39,8 +39,32 @@ namespace OpenSim.Framework
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ ///
+ /// Asset types used only in OpenSim.
+ /// To avoid clashing with the code numbers used in Second Life, use only negative numbers here.
+ ///
+ public enum OpenSimAssetType : sbyte
+ {
+ Material = -2
+ }
+
+
#region SL / file extension / content-type conversions
+ ///
+ /// Returns the Enum entry corresponding to the given code, regardless of whether it belongs
+ /// to the AssetType or OpenSimAssetType enums.
+ ///
+ public static object AssetTypeFromCode(sbyte assetType)
+ {
+ if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
+ return (OpenMetaverse.AssetType)assetType;
+ else if (Enum.IsDefined(typeof(OpenSimAssetType), assetType))
+ return (OpenSimAssetType)assetType;
+ else
+ return OpenMetaverse.AssetType.Unknown;
+ }
+
private class TypeMapping
{
private sbyte assetType;
@@ -56,12 +80,7 @@ namespace OpenSim.Framework
public object AssetType
{
- get {
- if (Enum.IsDefined(typeof(OpenMetaverse.AssetType), assetType))
- return (OpenMetaverse.AssetType)assetType;
- else
- return OpenMetaverse.AssetType.Unknown;
- }
+ get { return AssetTypeFromCode(assetType); }
}
public InventoryType InventoryType
@@ -102,6 +121,11 @@ namespace OpenSim.Framework
: this((sbyte)assetType, inventoryType, contentType, null, extension)
{
}
+
+ public TypeMapping(OpenSimAssetType assetType, InventoryType inventoryType, string contentType, string extension)
+ : this((sbyte)assetType, inventoryType, contentType, null, extension)
+ {
+ }
}
///
@@ -142,7 +166,9 @@ namespace OpenSim.Framework
new TypeMapping(AssetType.CurrentOutfitFolder, InventoryType.Unknown, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
new TypeMapping(AssetType.OutfitFolder, InventoryType.Unknown, "application/vnd.ll.outfitfolder", "outfitfolder"),
new TypeMapping(AssetType.MyOutfitsFolder, InventoryType.Unknown, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
- new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm")
+ new TypeMapping(AssetType.Mesh, InventoryType.Mesh, "application/vnd.ll.mesh", "llm"),
+
+ new TypeMapping(OpenSimAssetType.Material, InventoryType.Unknown, "application/llsd+xml", "material")
};
private static Dictionary asset2Content;
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index 0c12787..73ebfae 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -29,6 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using OpenMetaverse;
+using OpenSimAssetType = OpenSim.Framework.SLUtil.OpenSimAssetType;
namespace OpenSim.Framework.Serialization
{
@@ -128,6 +129,7 @@ namespace OpenSim.Framework.Serialization
ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Texture] = ASSET_EXTENSION_SEPARATOR + "texture.jp2";
ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TextureTGA] = ASSET_EXTENSION_SEPARATOR + "texture.tga";
ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.TrashFolder] = ASSET_EXTENSION_SEPARATOR + "trashfolder.txt"; // Not sure if we'll ever see this
+ ASSET_TYPE_TO_EXTENSION[(sbyte)OpenSimAssetType.Material] = ASSET_EXTENSION_SEPARATOR + "material.xml"; // Not sure if we'll ever see this
EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "animation.bvh"] = (sbyte)AssetType.Animation;
EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "bodypart.txt"] = (sbyte)AssetType.Bodypart;
@@ -152,6 +154,7 @@ namespace OpenSim.Framework.Serialization
EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "texture.jp2"] = (sbyte)AssetType.Texture;
EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "texture.tga"] = (sbyte)AssetType.TextureTGA;
EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "trashfolder.txt"] = (sbyte)AssetType.TrashFolder;
+ EXTENSION_TO_ASSET_TYPE[ASSET_EXTENSION_SEPARATOR + "material.xml"] = (sbyte)OpenSimAssetType.Material;
}
public static string CreateOarLandDataPath(LandData ld)
--
cgit v1.1
From 8e72b53edc435c2c2fbec0b8c91304e7f7a6a4f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 20 Jan 2014 19:16:19 +0000
Subject: Stop exceptions being generated on agent connection if a telehub
object has been deleted or has no spawn points.
---
OpenSim/Framework/RegionSettings.cs | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index db8c53e..a895c40 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -482,21 +482,14 @@ namespace OpenSim.Framework
set { m_LoadedCreationID = value; }
}
- // Connected Telehub object
- private UUID m_TelehubObject = UUID.Zero;
- public UUID TelehubObject
- {
- get
- {
- return m_TelehubObject;
- }
- set
- {
- m_TelehubObject = value;
- }
- }
+ ///
+ /// Connected Telehub object
+ ///
+ public UUID TelehubObject { get; set; }
- // Our Connected Telehub's SpawnPoints
+ ///
+ /// Our connected Telehub's SpawnPoints
+ ///
public List l_SpawnPoints = new List();
// Add a SpawnPoint
--
cgit v1.1