Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite
parent
d977bb77cb
commit
1bd0b06ec1
|
@ -1232,6 +1232,8 @@ namespace OpenSim.Data.SQLite
|
||||||
createCol(prims, "VolumeDetect", typeof(Int16));
|
createCol(prims, "VolumeDetect", typeof(Int16));
|
||||||
|
|
||||||
createCol(prims, "MediaURL", typeof(String));
|
createCol(prims, "MediaURL", typeof(String));
|
||||||
|
|
||||||
|
createCol(prims, "DynAttrs", typeof(String));
|
||||||
|
|
||||||
// Add in contraints
|
// Add in contraints
|
||||||
prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
|
prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
|
||||||
|
@ -1280,6 +1282,7 @@ namespace OpenSim.Data.SQLite
|
||||||
createCol(shapes, "Texture", typeof(Byte[]));
|
createCol(shapes, "Texture", typeof(Byte[]));
|
||||||
createCol(shapes, "ExtraParams", typeof(Byte[]));
|
createCol(shapes, "ExtraParams", typeof(Byte[]));
|
||||||
createCol(shapes, "Media", typeof(String));
|
createCol(shapes, "Media", typeof(String));
|
||||||
|
createCol(shapes, "DynAttrs", typeof(String));
|
||||||
|
|
||||||
shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] };
|
shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] };
|
||||||
|
|
||||||
|
@ -1711,6 +1714,16 @@ namespace OpenSim.Data.SQLite
|
||||||
// m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
|
// m_log.DebugFormat("[SQLITE]: MediaUrl type [{0}]", row["MediaURL"].GetType());
|
||||||
prim.MediaUrl = (string)row["MediaURL"];
|
prim.MediaUrl = (string)row["MediaURL"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!(row["DynAttrs"] is System.DBNull))
|
||||||
|
{
|
||||||
|
//m_log.DebugFormat("[SQLITE]: DynAttrs type [{0}]", row["DynAttrs"].GetType());
|
||||||
|
prim.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
prim.DynAttrs = new DynAttrsOSDMap();
|
||||||
|
}
|
||||||
|
|
||||||
return prim;
|
return prim;
|
||||||
}
|
}
|
||||||
|
@ -2133,6 +2146,7 @@ namespace OpenSim.Data.SQLite
|
||||||
row["VolumeDetect"] = 0;
|
row["VolumeDetect"] = 0;
|
||||||
|
|
||||||
row["MediaURL"] = prim.MediaUrl;
|
row["MediaURL"] = prim.MediaUrl;
|
||||||
|
row["DynAttrs"] = prim.DynAttrs.ToXml();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -2393,6 +2407,11 @@ namespace OpenSim.Data.SQLite
|
||||||
if (!(row["Media"] is System.DBNull))
|
if (!(row["Media"] is System.DBNull))
|
||||||
s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
|
s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
|
||||||
|
|
||||||
|
if (!(row["DynAttrs"] is System.DBNull))
|
||||||
|
s.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
|
||||||
|
else
|
||||||
|
s.DynAttrs = new DynAttrsOSDMap();
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2439,6 +2458,8 @@ namespace OpenSim.Data.SQLite
|
||||||
|
|
||||||
if (s.Media != null)
|
if (s.Media != null)
|
||||||
row["Media"] = s.Media.ToXml();
|
row["Media"] = s.Media.ToXml();
|
||||||
|
|
||||||
|
row["DynAttrs"] = s.DynAttrs.ToXml();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Text;
|
||||||
|
using System.Xml;
|
||||||
|
using System.Xml.Schema;
|
||||||
|
using System.Xml.Serialization;
|
||||||
|
using OpenMetaverse;
|
||||||
|
using OpenMetaverse.StructuredData;
|
||||||
|
|
||||||
|
namespace OpenSim.Framework
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// This is the map for storing and retrieving dynamic attributes.
|
||||||
|
/// </summary>
|
||||||
|
public class DynAttrsOSDMap : OSDMap, IXmlSerializable
|
||||||
|
{
|
||||||
|
public XmlSchema GetSchema() { return null; }
|
||||||
|
|
||||||
|
public static DynAttrsOSDMap FromXml(string rawXml)
|
||||||
|
{
|
||||||
|
DynAttrsOSDMap map = new DynAttrsOSDMap();
|
||||||
|
map.ReadXml(rawXml);
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReadXml(string rawXml)
|
||||||
|
{
|
||||||
|
//System.Console.WriteLine("Trying to deserialize [{0}]", rawXml);
|
||||||
|
|
||||||
|
OSDMap map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);
|
||||||
|
|
||||||
|
foreach (string key in map.Keys)
|
||||||
|
this[key] = map[key];
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ReadXml(XmlReader reader)
|
||||||
|
{
|
||||||
|
ReadXml(reader.ReadInnerXml());
|
||||||
|
}
|
||||||
|
|
||||||
|
public string ToXml()
|
||||||
|
{
|
||||||
|
return OSDParser.SerializeLLSDXmlString(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void WriteXml(XmlWriter writer)
|
||||||
|
{
|
||||||
|
writer.WriteRaw(ToXml());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -82,6 +82,11 @@ namespace OpenSim.Framework
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
private static readonly byte[] DEFAULT_TEXTURE = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")).GetBytes();
|
private static readonly byte[] DEFAULT_TEXTURE = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")).GetBytes();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Dynamic attributes can be created and deleted as required.
|
||||||
|
/// </summary>
|
||||||
|
public DynAttrsOSDMap DynAttrs { get; set; }
|
||||||
|
|
||||||
private byte[] m_textureEntry;
|
private byte[] m_textureEntry;
|
||||||
|
|
||||||
|
@ -194,6 +199,7 @@ namespace OpenSim.Framework
|
||||||
{
|
{
|
||||||
PCode = (byte)PCodeEnum.Primitive;
|
PCode = (byte)PCodeEnum.Primitive;
|
||||||
m_textureEntry = DEFAULT_TEXTURE;
|
m_textureEntry = DEFAULT_TEXTURE;
|
||||||
|
DynAttrs = new DynAttrsOSDMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -205,6 +211,7 @@ namespace OpenSim.Framework
|
||||||
// m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);
|
// m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);
|
||||||
|
|
||||||
PCode = (byte)prim.PrimData.PCode;
|
PCode = (byte)prim.PrimData.PCode;
|
||||||
|
DynAttrs = new DynAttrsOSDMap();
|
||||||
|
|
||||||
State = prim.PrimData.State;
|
State = prim.PrimData.State;
|
||||||
PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);
|
PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);
|
||||||
|
|
|
@ -37,6 +37,7 @@ using System.Xml.Serialization;
|
||||||
using log4net;
|
using log4net;
|
||||||
using OpenMetaverse;
|
using OpenMetaverse;
|
||||||
using OpenMetaverse.Packets;
|
using OpenMetaverse.Packets;
|
||||||
|
using OpenMetaverse.StructuredData;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Region.Framework.Interfaces;
|
using OpenSim.Region.Framework.Interfaces;
|
||||||
using OpenSim.Region.Framework.Scenes.Scripting;
|
using OpenSim.Region.Framework.Scenes.Scripting;
|
||||||
|
@ -124,6 +125,11 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Dynamic attributes can be created and deleted as required.
|
||||||
|
/// </summary>
|
||||||
|
public DynAttrsOSDMap DynAttrs { get; set; }
|
||||||
|
|
||||||
/// <value>
|
/// <value>
|
||||||
/// Is this a root part?
|
/// Is this a root part?
|
||||||
/// </value>
|
/// </value>
|
||||||
|
@ -335,6 +341,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
m_particleSystem = Utils.EmptyBytes;
|
m_particleSystem = Utils.EmptyBytes;
|
||||||
Rezzed = DateTime.UtcNow;
|
Rezzed = DateTime.UtcNow;
|
||||||
Description = String.Empty;
|
Description = String.Empty;
|
||||||
|
DynAttrs = new DynAttrsOSDMap();
|
||||||
|
|
||||||
// Prims currently only contain a single folder (Contents). From looking at the Second Life protocol,
|
// 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
|
// this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from
|
||||||
|
@ -4598,4 +4605,4 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue