Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XMLavinationmerge
Melanie
commit
231c298ca5
|
|
@ -823,12 +823,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
|
||||
handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
|
||||
|
||||
handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
|
||||
// OutPacket(handshake, ThrottleOutPacketType.Task);
|
||||
// use same as MoveAgentIntoRegion (both should be task )
|
||||
handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
|
||||
handshake.RegionInfo4[0] = new RegionHandshakePacket.RegionInfo4Block();
|
||||
handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
|
||||
handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
|
||||
|
||||
OutPacket(handshake, ThrottleOutPacketType.Unknown);
|
||||
}
|
||||
|
||||
|
||||
public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
|
||||
{
|
||||
AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
|
||||
|
|
|
|||
|
|
@ -5005,6 +5005,14 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
oldTex.DefaultTexture = fallbackOldFace;
|
||||
}
|
||||
|
||||
// Materials capable viewers can send a ObjectImage packet
|
||||
// when nothing in TE has changed. MaterialID should be updated
|
||||
// by the RenderMaterials CAP handler, so updating it here may cause a
|
||||
// race condtion. Therefore, if no non-materials TE fields have changed,
|
||||
// we should ignore any changes and not update Shape.TextureEntry
|
||||
|
||||
bool otherFieldsChanged = false;
|
||||
|
||||
for (int i = 0 ; i < GetNumberOfSides(); i++)
|
||||
{
|
||||
|
||||
|
|
@ -5031,18 +5039,36 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// Max change, skip the rest of testing
|
||||
if (changeFlags == (Changed.TEXTURE | Changed.COLOR))
|
||||
break;
|
||||
|
||||
if (!otherFieldsChanged)
|
||||
{
|
||||
if (oldFace.Bump != newFace.Bump) otherFieldsChanged = true;
|
||||
if (oldFace.Fullbright != newFace.Fullbright) otherFieldsChanged = true;
|
||||
if (oldFace.Glow != newFace.Glow) otherFieldsChanged = true;
|
||||
if (oldFace.MediaFlags != newFace.MediaFlags) otherFieldsChanged = true;
|
||||
if (oldFace.OffsetU != newFace.OffsetU) otherFieldsChanged = true;
|
||||
if (oldFace.OffsetV != newFace.OffsetV) otherFieldsChanged = true;
|
||||
if (oldFace.RepeatU != newFace.RepeatU) otherFieldsChanged = true;
|
||||
if (oldFace.RepeatV != newFace.RepeatV) otherFieldsChanged = true;
|
||||
if (oldFace.Rotation != newFace.Rotation) otherFieldsChanged = true;
|
||||
if (oldFace.Shiny != newFace.Shiny) otherFieldsChanged = true;
|
||||
if (oldFace.TexMapType != newFace.TexMapType) otherFieldsChanged = true;
|
||||
}
|
||||
}
|
||||
|
||||
m_shape.TextureEntry = newTex.GetBytes();
|
||||
if (changeFlags != 0)
|
||||
TriggerScriptChangedEvent(changeFlags);
|
||||
UpdateFlag = UpdateRequired.FULL;
|
||||
ParentGroup.HasGroupChanged = true;
|
||||
if (changeFlags != 0 || otherFieldsChanged)
|
||||
{
|
||||
m_shape.TextureEntry = newTex.GetBytes();
|
||||
if (changeFlags != 0)
|
||||
TriggerScriptChangedEvent(changeFlags);
|
||||
UpdateFlag = UpdateRequired.FULL;
|
||||
ParentGroup.HasGroupChanged = true;
|
||||
|
||||
//This is madness..
|
||||
//ParentGroup.ScheduleGroupForFullUpdate();
|
||||
//This is sparta
|
||||
ScheduleFullUpdate();
|
||||
//This is madness..
|
||||
//ParentGroup.ScheduleGroupForFullUpdate();
|
||||
//This is sparta
|
||||
ScheduleFullUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,579 @@
|
|||
/*
|
||||
* 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.Reflection;
|
||||
using System.Security.Cryptography; // for computing md5 hash
|
||||
using log4net;
|
||||
using Mono.Addins;
|
||||
using Nini.Config;
|
||||
|
||||
using OpenMetaverse;
|
||||
using OpenMetaverse.StructuredData;
|
||||
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Framework.Servers.HttpServer;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
|
||||
using Ionic.Zlib;
|
||||
|
||||
// You will need to uncomment these lines if you are adding a region module to some other assembly which does not already
|
||||
// specify its assembly. Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
|
||||
// the available DLLs
|
||||
//[assembly: Addin("MaterialsDemoModule", "1.0")]
|
||||
//[assembly: AddinDependency("OpenSim", "0.5")]
|
||||
|
||||
namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
// # # ## ##### # # # # # ####
|
||||
// # # # # # # ## # # ## # # #
|
||||
// # # # # # # # # # # # # # #
|
||||
// # ## # ###### ##### # # # # # # # # ###
|
||||
// ## ## # # # # # ## # # ## # #
|
||||
// # # # # # # # # # # # ####
|
||||
//
|
||||
// THIS MODULE IS FOR EXPERIMENTAL USE ONLY AND MAY CAUSE REGION OR ASSET CORRUPTION!
|
||||
//
|
||||
////////////// WARNING //////////////////////////////////////////////////////////////////
|
||||
/// This is an *Experimental* module for developing support for materials-capable viewers
|
||||
/// This module should NOT be used in a production environment! It may cause data corruption and
|
||||
/// viewer crashes. It should be only used to evaluate implementations of materials.
|
||||
///
|
||||
/// Materials are persisted via SceneObjectPart.dynattrs. This is a relatively new feature
|
||||
/// of OpenSimulator and is not field proven at the time this module was written. Persistence
|
||||
/// may fail or become corrupt and this could cause viewer crashes due to erroneous materials
|
||||
/// data being sent to viewers. Materials descriptions might survive IAR, OAR, or other means
|
||||
/// of archiving however the texture resources used by these materials probably will not as they
|
||||
/// may not be adequately referenced to ensure proper archiving.
|
||||
///
|
||||
///
|
||||
///
|
||||
/// To enable this module, add this string at the bottom of OpenSim.ini:
|
||||
/// [MaterialsDemoModule]
|
||||
///
|
||||
/// </summary>
|
||||
///
|
||||
|
||||
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MaterialsDemoModule")]
|
||||
public class MaterialsDemoModule : INonSharedRegionModule
|
||||
{
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
public string Name { get { return "MaterialsDemoModule"; } }
|
||||
|
||||
public Type ReplaceableInterface { get { return null; } }
|
||||
|
||||
private Scene m_scene = null;
|
||||
private bool m_enabled = false;
|
||||
|
||||
public Dictionary<UUID, OSDMap> m_knownMaterials = new Dictionary<UUID, OSDMap>();
|
||||
|
||||
public void Initialise(IConfigSource source)
|
||||
{
|
||||
m_enabled = (source.Configs["MaterialsDemoModule"] != null);
|
||||
if (!m_enabled)
|
||||
return;
|
||||
|
||||
m_log.DebugFormat("[MaterialsDemoModule]: INITIALIZED MODULE");
|
||||
}
|
||||
|
||||
public void Close()
|
||||
{
|
||||
if (!m_enabled)
|
||||
return;
|
||||
|
||||
m_log.DebugFormat("[MaterialsDemoModule]: CLOSED MODULE");
|
||||
}
|
||||
|
||||
public void AddRegion(Scene scene)
|
||||
{
|
||||
if (!m_enabled)
|
||||
return;
|
||||
|
||||
m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
|
||||
m_scene = scene;
|
||||
m_scene.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(OnRegisterCaps);
|
||||
m_scene.EventManager.OnObjectAddedToScene += new Action<SceneObjectGroup>(EventManager_OnObjectAddedToScene);
|
||||
}
|
||||
|
||||
void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
|
||||
{
|
||||
foreach (var part in obj.Parts)
|
||||
if (part != null)
|
||||
GetStoredMaterialsForPart(part);
|
||||
}
|
||||
|
||||
void OnRegisterCaps(OpenMetaverse.UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
|
||||
{
|
||||
string capsBase = "/CAPS/" + caps.CapsObjectPath;
|
||||
|
||||
IRequestHandler renderMaterialsPostHandler = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap);
|
||||
caps.RegisterHandler("RenderMaterials", renderMaterialsPostHandler);
|
||||
|
||||
// OpenSimulator CAPs infrastructure seems to be somewhat hostile towards any CAP that requires both GET
|
||||
// and POST handlers, (at least at the time this was originally written), so we first set up a POST
|
||||
// handler normally and then add a GET handler via MainServer
|
||||
|
||||
IRequestHandler renderMaterialsGetHandler = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap);
|
||||
MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
|
||||
|
||||
// materials viewer seems to use either POST or PUT, so assign POST handler for PUT as well
|
||||
IRequestHandler renderMaterialsPutHandler = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap);
|
||||
MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
|
||||
}
|
||||
|
||||
public void RemoveRegion(Scene scene)
|
||||
{
|
||||
if (!m_enabled)
|
||||
return;
|
||||
|
||||
m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
|
||||
}
|
||||
|
||||
public void RegionLoaded(Scene scene)
|
||||
{
|
||||
}
|
||||
|
||||
OSDMap GetMaterial(UUID id)
|
||||
{
|
||||
OSDMap map = null;
|
||||
if (m_knownMaterials.ContainsKey(id))
|
||||
{
|
||||
map = new OSDMap();
|
||||
map["ID"] = OSD.FromBinary(id.GetBytes());
|
||||
map["Material"] = m_knownMaterials[id];
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
void GetStoredMaterialsForPart(SceneObjectPart part)
|
||||
{
|
||||
OSDMap OSMaterials = null;
|
||||
OSDArray matsArr = null;
|
||||
|
||||
if (part.DynAttrs == null)
|
||||
{
|
||||
m_log.Warn("[MaterialsDemoModule]: NULL DYNATTRS :( ");
|
||||
}
|
||||
|
||||
lock (part.DynAttrs)
|
||||
{
|
||||
if (part.DynAttrs.ContainsKey("OS:Materials"))
|
||||
OSMaterials = part.DynAttrs["OS:Materials"];
|
||||
if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
|
||||
{
|
||||
|
||||
OSD osd = OSMaterials["Materials"];
|
||||
if (osd is OSDArray)
|
||||
matsArr = osd as OSDArray;
|
||||
}
|
||||
}
|
||||
|
||||
if (OSMaterials == null)
|
||||
return;
|
||||
|
||||
m_log.Info("[MaterialsDemoModule]: OSMaterials: " + OSDParser.SerializeJsonString(OSMaterials));
|
||||
|
||||
|
||||
if (matsArr == null)
|
||||
{
|
||||
m_log.Info("[MaterialsDemoModule]: matsArr is null :( ");
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (OSD elemOsd in matsArr)
|
||||
{
|
||||
if (elemOsd != null && elemOsd is OSDMap)
|
||||
{
|
||||
|
||||
OSDMap matMap = elemOsd as OSDMap;
|
||||
if (matMap.ContainsKey("ID") && matMap.ContainsKey("Material"))
|
||||
{
|
||||
try
|
||||
{
|
||||
m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.Warn("[MaterialsDemoModule]: exception decoding persisted material: " + e.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void StoreMaterialsForPart(SceneObjectPart part)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (part == null || part.Shape == null)
|
||||
return;
|
||||
|
||||
Dictionary<UUID, OSDMap> mats = new Dictionary<UUID, OSDMap>();
|
||||
|
||||
Primitive.TextureEntry te = part.Shape.Textures;
|
||||
|
||||
if (te.DefaultTexture != null)
|
||||
{
|
||||
if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
|
||||
mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
|
||||
}
|
||||
|
||||
if (te.FaceTextures != null)
|
||||
{
|
||||
foreach (var face in te.FaceTextures)
|
||||
{
|
||||
if (face != null)
|
||||
{
|
||||
if (m_knownMaterials.ContainsKey(face.MaterialID))
|
||||
mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
|
||||
}
|
||||
}
|
||||
}
|
||||
if (mats.Count == 0)
|
||||
return;
|
||||
|
||||
OSDArray matsArr = new OSDArray();
|
||||
foreach (KeyValuePair<UUID, OSDMap> kvp in mats)
|
||||
{
|
||||
OSDMap matOsd = new OSDMap();
|
||||
matOsd["ID"] = OSD.FromUUID(kvp.Key);
|
||||
matOsd["Material"] = kvp.Value;
|
||||
matsArr.Add(matOsd);
|
||||
}
|
||||
|
||||
OSDMap OSMaterials = new OSDMap();
|
||||
OSMaterials["Materials"] = matsArr;
|
||||
|
||||
lock (part.DynAttrs)
|
||||
part.DynAttrs["OS:Materials"] = OSMaterials;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.Warn("[MaterialsDemoModule]: exception in StoreMaterialsForPart(): " + e.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public string RenderMaterialsPostCap(string request, string path,
|
||||
string param, IOSHttpRequest httpRequest,
|
||||
IOSHttpResponse httpResponse)
|
||||
{
|
||||
m_log.Debug("[MaterialsDemoModule]: POST cap handler");
|
||||
|
||||
OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
|
||||
OSDMap resp = new OSDMap();
|
||||
|
||||
OSDMap materialsFromViewer = null;
|
||||
|
||||
OSDArray respArr = new OSDArray();
|
||||
|
||||
if (req.ContainsKey("Zipped"))
|
||||
{
|
||||
OSD osd = null;
|
||||
|
||||
byte[] inBytes = req["Zipped"].AsBinary();
|
||||
|
||||
try
|
||||
{
|
||||
osd = ZDecompressBytesToOsd(inBytes);
|
||||
|
||||
if (osd != null)
|
||||
{
|
||||
if (osd is OSDArray) // assume array of MaterialIDs designating requested material entries
|
||||
{
|
||||
foreach (OSD elem in (OSDArray)osd)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
UUID id = new UUID(elem.AsBinary(), 0);
|
||||
|
||||
if (m_knownMaterials.ContainsKey(id))
|
||||
{
|
||||
m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
|
||||
OSDMap matMap = new OSDMap();
|
||||
matMap["ID"] = OSD.FromBinary(id.GetBytes());
|
||||
|
||||
matMap["Material"] = m_knownMaterials[id];
|
||||
respArr.Add(matMap);
|
||||
}
|
||||
else
|
||||
m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// report something here?
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (osd is OSDMap) // reqest to assign a material
|
||||
{
|
||||
materialsFromViewer = osd as OSDMap;
|
||||
|
||||
if (materialsFromViewer.ContainsKey("FullMaterialsPerFace"))
|
||||
{
|
||||
OSD matsOsd = materialsFromViewer["FullMaterialsPerFace"];
|
||||
if (matsOsd is OSDArray)
|
||||
{
|
||||
OSDArray matsArr = matsOsd as OSDArray;
|
||||
|
||||
try
|
||||
{
|
||||
foreach (OSDMap matsMap in matsArr)
|
||||
{
|
||||
m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
|
||||
|
||||
uint matLocalID = 0;
|
||||
try { matLocalID = matsMap["ID"].AsUInteger(); }
|
||||
catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
|
||||
m_log.Debug("[MaterialsDemoModule]: matLocalId: " + matLocalID.ToString());
|
||||
|
||||
|
||||
OSDMap mat = null;
|
||||
try { mat = matsMap["Material"] as OSDMap; }
|
||||
catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"Material\" from matsMap: " + e.Message); }
|
||||
m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
|
||||
|
||||
UUID id = HashOsd(mat);
|
||||
m_knownMaterials[id] = mat;
|
||||
|
||||
|
||||
var sop = m_scene.GetSceneObjectPart(matLocalID);
|
||||
if (sop == null)
|
||||
m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
|
||||
else
|
||||
{
|
||||
//var te = sop.Shape.Textures;
|
||||
var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
|
||||
|
||||
if (te == null)
|
||||
{
|
||||
m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + matLocalID.ToString());
|
||||
}
|
||||
else
|
||||
{
|
||||
int face = -1;
|
||||
|
||||
if (matsMap.ContainsKey("Face"))
|
||||
{
|
||||
face = matsMap["Face"].AsInteger();
|
||||
if (te.FaceTextures == null) // && face == 0)
|
||||
{
|
||||
if (te.DefaultTexture == null)
|
||||
m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
|
||||
else
|
||||
{
|
||||
if (te.DefaultTexture.MaterialID == null)
|
||||
m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null");
|
||||
else
|
||||
{
|
||||
te.DefaultTexture.MaterialID = id;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (te.FaceTextures.Length >= face - 1)
|
||||
{
|
||||
if (te.FaceTextures[face] == null)
|
||||
te.DefaultTexture.MaterialID = id;
|
||||
else
|
||||
te.FaceTextures[face].MaterialID = id;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (te.DefaultTexture != null)
|
||||
te.DefaultTexture.MaterialID = id;
|
||||
}
|
||||
|
||||
m_log.Debug("[MaterialsDemoModule]: setting material ID for face " + face.ToString() + " to " + id.ToString());
|
||||
|
||||
//we cant use sop.UpdateTextureEntry(te); because it filters so do it manually
|
||||
|
||||
if (sop.ParentGroup != null)
|
||||
{
|
||||
sop.Shape.TextureEntry = te.GetBytes();
|
||||
sop.TriggerScriptChangedEvent(Changed.TEXTURE);
|
||||
sop.UpdateFlag = UpdateRequired.FULL;
|
||||
sop.ParentGroup.HasGroupChanged = true;
|
||||
|
||||
sop.ScheduleFullUpdate();
|
||||
|
||||
StoreMaterialsForPart(sop);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload: " + e.Message);
|
||||
//return "";
|
||||
}
|
||||
m_log.Debug("[MaterialsDemoModule]: knownMaterials.Count: " + m_knownMaterials.Count.ToString());
|
||||
}
|
||||
|
||||
|
||||
resp["Zipped"] = ZCompressOSD(respArr, false);
|
||||
string response = OSDParser.SerializeLLSDXmlString(resp);
|
||||
|
||||
//m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
|
||||
m_log.Debug("[MaterialsDemoModule]: cap request (zipped portion): " + ZippedOsdBytesToString(req["Zipped"].AsBinary()));
|
||||
m_log.Debug("[MaterialsDemoModule]: cap response: " + response);
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
public string RenderMaterialsGetCap(string request, string path,
|
||||
string param, IOSHttpRequest httpRequest,
|
||||
IOSHttpResponse httpResponse)
|
||||
{
|
||||
m_log.Debug("[MaterialsDemoModule]: GET cap handler");
|
||||
|
||||
OSDMap resp = new OSDMap();
|
||||
|
||||
|
||||
int matsCount = 0;
|
||||
|
||||
OSDArray allOsd = new OSDArray();
|
||||
|
||||
foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
|
||||
{
|
||||
OSDMap matMap = new OSDMap();
|
||||
|
||||
matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
|
||||
|
||||
matMap["Material"] = kvp.Value;
|
||||
allOsd.Add(matMap);
|
||||
matsCount++;
|
||||
}
|
||||
|
||||
|
||||
resp["Zipped"] = ZCompressOSD(allOsd, false);
|
||||
m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
|
||||
|
||||
return OSDParser.SerializeLLSDXmlString(resp);
|
||||
}
|
||||
|
||||
static string ZippedOsdBytesToString(byte[] bytes)
|
||||
{
|
||||
try
|
||||
{
|
||||
return OSDParser.SerializeJsonString(ZDecompressBytesToOsd(bytes));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return "ZippedOsdBytesToString caught an exception: " + e.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// computes a UUID by hashing a OSD object
|
||||
/// </summary>
|
||||
/// <param name="osd"></param>
|
||||
/// <returns></returns>
|
||||
private static UUID HashOsd(OSD osd)
|
||||
{
|
||||
using (var md5 = MD5.Create())
|
||||
using (MemoryStream ms = new MemoryStream(OSDParser.SerializeLLSDBinary(osd, false)))
|
||||
return new UUID(md5.ComputeHash(ms), 0);
|
||||
}
|
||||
|
||||
public static OSD ZCompressOSD(OSD inOsd, bool useHeader)
|
||||
{
|
||||
OSD osd = null;
|
||||
|
||||
using (MemoryStream msSinkCompressed = new MemoryStream())
|
||||
{
|
||||
using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkCompressed,
|
||||
Ionic.Zlib.CompressionMode.Compress, CompressionLevel.BestCompression, true))
|
||||
{
|
||||
CopyStream(new MemoryStream(OSDParser.SerializeLLSDBinary(inOsd, useHeader)), zOut);
|
||||
zOut.Close();
|
||||
}
|
||||
|
||||
msSinkCompressed.Seek(0L, SeekOrigin.Begin);
|
||||
osd = OSD.FromBinary( msSinkCompressed.ToArray());
|
||||
}
|
||||
|
||||
return osd;
|
||||
}
|
||||
|
||||
|
||||
public static OSD ZDecompressBytesToOsd(byte[] input)
|
||||
{
|
||||
OSD osd = null;
|
||||
|
||||
using (MemoryStream msSinkUnCompressed = new MemoryStream())
|
||||
{
|
||||
using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkUnCompressed, CompressionMode.Decompress, true))
|
||||
{
|
||||
CopyStream(new MemoryStream(input), zOut);
|
||||
zOut.Close();
|
||||
}
|
||||
msSinkUnCompressed.Seek(0L, SeekOrigin.Begin);
|
||||
osd = OSDParser.DeserializeLLSDBinary(msSinkUnCompressed.ToArray());
|
||||
}
|
||||
|
||||
return osd;
|
||||
}
|
||||
|
||||
static void CopyStream(System.IO.Stream input, System.IO.Stream output)
|
||||
{
|
||||
byte[] buffer = new byte[2048];
|
||||
int len;
|
||||
while ((len = input.Read(buffer, 0, 2048)) > 0)
|
||||
{
|
||||
output.Write(buffer, 0, len);
|
||||
}
|
||||
|
||||
output.Flush();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
BIN
bin/CSJ2K.dll
BIN
bin/CSJ2K.dll
Binary file not shown.
|
|
@ -1,130 +1,18 @@
|
|||
<?xml version="1.0"?>
|
||||
<doc>
|
||||
<assembly>
|
||||
<name>/home/root/libomv-0.9.1-source/bin/OpenMetaverse.StructuredData</name>
|
||||
<name>OpenMetaverse.StructuredData</name>
|
||||
</assembly>
|
||||
<members>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDType">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Real">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.String">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Date">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.URI">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Map">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Array">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDException">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSD">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSD.SerializeMembers(System.Object)">
|
||||
<summary>
|
||||
Uses reflection to create an SDMap from all of the SD
|
||||
serializable types in an object
|
||||
</summary>
|
||||
<param name="obj">Class or struct containing serializable types</param>
|
||||
<returns>An SDMap holding the serialized values from the
|
||||
container object</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
|
||||
<summary>
|
||||
Uses reflection to deserialize member variables in an object from
|
||||
an SDMap
|
||||
</summary>
|
||||
<param name="obj">Reference to an object to fill with deserialized
|
||||
values</param>
|
||||
<param name="serialized">Serialized values to put in the target
|
||||
object</param>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDBoolean">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDInteger">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDReal">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDString">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDUUID">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDDate">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDUri">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDBinary">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDMap">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDArray">
|
||||
<summary>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDParser">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
|
||||
|
|
@ -153,8 +41,7 @@
|
|||
Serializes OSD to binary format
|
||||
</summary>
|
||||
<param name="osd">OSD to serialize</param>
|
||||
<param name="prependHeader">
|
||||
</param>
|
||||
<param name="prependHeader"></param>
|
||||
<returns>Serialized data</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinaryStream(OpenMetaverse.StructuredData.OSD)">
|
||||
|
|
@ -169,209 +56,294 @@
|
|||
Serializes OSD to binary format
|
||||
</summary>
|
||||
<param name="data">OSD to serialize</param>
|
||||
<param name="prependHeader">
|
||||
</param>
|
||||
<param name="prependHeader"></param>
|
||||
<returns>Serialized data</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.SkipWhiteSpace(System.IO.Stream)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="stream">
|
||||
</param>
|
||||
<param name="stream"></param>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.FindByte(System.IO.Stream,System.Byte)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="stream">
|
||||
</param>
|
||||
<param name="toFind">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="stream"></param>
|
||||
<param name="toFind"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.FindString(System.IO.Stream,System.String)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="stream">
|
||||
</param>
|
||||
<param name="toFind">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="stream"></param>
|
||||
<param name="toFind"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.ConsumeBytes(System.IO.Stream,System.Int32)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="stream">
|
||||
</param>
|
||||
<param name="consumeBytes">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="stream"></param>
|
||||
<param name="consumeBytes"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostInt(System.Byte[])">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="binaryNetEnd">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="binaryNetEnd"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostDouble(System.Byte[])">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="binaryNetEnd">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="binaryNetEnd"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.HostToNetworkIntBytes(System.Int32)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="intHostEnd">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDNotationElement(System.IO.StringReader)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="reader">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.PeekAndSkipWhitespace(System.IO.StringReader)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="reader">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.ReadAndSkipWhitespace(System.IO.StringReader)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="reader">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.GetLengthInBrackets(System.IO.StringReader)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="reader">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.GetStringDelimitedBy(System.IO.StringReader,System.Char)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="reader">
|
||||
</param>
|
||||
<param name="delimiter">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.BufferCharactersEqual(System.IO.StringReader,System.Char[],System.Int32)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="reader">
|
||||
</param>
|
||||
<param name="buffer">
|
||||
</param>
|
||||
<param name="offset">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.UnescapeCharacter(System.String,System.Char)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="s">
|
||||
</param>
|
||||
<param name="c">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.EscapeCharacter(System.String,System.Char)">
|
||||
<summary>
|
||||
</summary>
|
||||
<param name="s">
|
||||
</param>
|
||||
<param name="c">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="intHostEnd"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Byte[])">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="xmlData">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="xmlData"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.String)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="xmlData">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="xmlData"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Xml.XmlTextReader)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="xmlData">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="xmlData"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(OpenMetaverse.StructuredData.OSD)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="data">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="data"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlString(OpenMetaverse.StructuredData.OSD)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="data">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="data"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlElement(System.Xml.XmlTextWriter,OpenMetaverse.StructuredData.OSD)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="writer">
|
||||
</param>
|
||||
<param name="data">
|
||||
</param>
|
||||
<param name="writer"></param>
|
||||
<param name="data"></param>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.TryValidateLLSDXml(System.Xml.XmlTextReader,System.String@)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="xmlData">
|
||||
</param>
|
||||
<param name="error">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
<param name="xmlData"></param>
|
||||
<param name="error"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.ParseLLSDXmlElement(System.Xml.XmlTextReader)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDNotationElement(System.IO.StringReader)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.PeekAndSkipWhitespace(System.IO.StringReader)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.ReadAndSkipWhitespace(System.IO.StringReader)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.GetLengthInBrackets(System.IO.StringReader)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.GetStringDelimitedBy(System.IO.StringReader,System.Char)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader"></param>
|
||||
<param name="delimiter"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.BufferCharactersEqual(System.IO.StringReader,System.Char[],System.Int32)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader"></param>
|
||||
<param name="buffer"></param>
|
||||
<param name="offset"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.UnescapeCharacter(System.String,System.Char)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="s"></param>
|
||||
<param name="c"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSDParser.EscapeCharacter(System.String,System.Char)">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="s"></param>
|
||||
<param name="c"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDType">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Real">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.String">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Date">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.URI">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Map">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="F:OpenMetaverse.StructuredData.OSDType.Array">
|
||||
<summary></summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDException">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSD">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSD.SerializeMembers(System.Object)">
|
||||
<summary>
|
||||
Uses reflection to create an SDMap from all of the SD
|
||||
serializable types in an object
|
||||
</summary>
|
||||
<param name="obj">Class or struct containing serializable types</param>
|
||||
<returns>An SDMap holding the serialized values from the
|
||||
container object</returns>
|
||||
</member>
|
||||
<member name="M:OpenMetaverse.StructuredData.OSD.DeserializeMembers(System.Object@,OpenMetaverse.StructuredData.OSDMap)">
|
||||
<summary>
|
||||
Uses reflection to deserialize member variables in an object from
|
||||
an SDMap
|
||||
</summary>
|
||||
<param name="obj">Reference to an object to fill with deserialized
|
||||
values</param>
|
||||
<param name="serialized">Serialized values to put in the target
|
||||
object</param>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDBoolean">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDInteger">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDReal">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDString">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDUUID">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDDate">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDUri">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDBinary">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDMap">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:OpenMetaverse.StructuredData.OSDArray">
|
||||
<summary>
|
||||
|
||||
</summary>
|
||||
<param name="reader">
|
||||
</param>
|
||||
<returns>
|
||||
</returns>
|
||||
</member>
|
||||
</members>
|
||||
</doc>
|
||||
|
|
|
|||
Binary file not shown.
39015
bin/OpenMetaverse.XML
39015
bin/OpenMetaverse.XML
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
|
@ -1,5 +1,7 @@
|
|||
<configuration>
|
||||
<dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" />
|
||||
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" />
|
||||
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" />
|
||||
<dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib" />
|
||||
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" />
|
||||
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" />
|
||||
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" />
|
||||
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" />
|
||||
</configuration>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
|
@ -18,13 +18,13 @@
|
|||
; Set path to directory for plugin registry. Information
|
||||
; about the registered repositories and installed plugins
|
||||
; will be stored here
|
||||
; The Robust.exe process must hvae R/W access to the location
|
||||
; The Robust.exe process must have R/W access to the location
|
||||
RegistryLocation = "."
|
||||
|
||||
|
||||
; Modular configurations
|
||||
; Set path to directory for modular ini files...
|
||||
; The Robust.exe process must hvae R/W access to the location
|
||||
; The Robust.exe process must have R/W access to the location
|
||||
ConfigDirectory = "/home/opensim/etc/Configs"
|
||||
|
||||
[ServiceList]
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1760,6 +1760,7 @@
|
|||
<Reference name="System.Xml"/>
|
||||
<Reference name="System.Drawing"/>
|
||||
<Reference name="System.Web"/>
|
||||
<Reference name="Ionic.Zip" path="../../../bin/"/>
|
||||
<Reference name="NDesk.Options" path="../../../bin/"/>
|
||||
<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
|
||||
<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue