Update svn properties.

0.6.0-stable
Jeff Ames 2008-04-07 14:19:08 +00:00
parent 927003de33
commit 8833a72388
8 changed files with 1235 additions and 1235 deletions

View File

@ -1,75 +1,75 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections; using System.Collections;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {
public class DataRequestHandler public class DataRequestHandler
{ {
private Scene m_scene = null; private Scene m_scene = null;
private DataSnapshotManager m_externalData = null; private DataSnapshotManager m_externalData = null;
private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public DataRequestHandler(Scene scene, DataSnapshotManager externalData) public DataRequestHandler(Scene scene, DataSnapshotManager externalData)
{ {
m_scene = scene; m_scene = scene;
m_externalData = externalData; m_externalData = externalData;
if (m_scene.AddHTTPHandler("collector", OnGetSnapshot)) if (m_scene.AddHTTPHandler("collector", OnGetSnapshot))
{ {
m_log.Info("[DATASNAPSHOT]: Set up snapshot service"); m_log.Info("[DATASNAPSHOT]: Set up snapshot service");
} }
//harbl //harbl
} }
public Hashtable OnGetSnapshot(Hashtable keysvals) public Hashtable OnGetSnapshot(Hashtable keysvals)
{ {
m_log.Info("[DATASNAPSHOT] Received collection request"); m_log.Info("[DATASNAPSHOT] Received collection request");
Hashtable reply = new Hashtable(); Hashtable reply = new Hashtable();
int statuscode = 200; int statuscode = 200;
string snapObj = (string)keysvals["region"]; string snapObj = (string)keysvals["region"];
XmlDocument response = m_externalData.GetSnapshot(snapObj); XmlDocument response = m_externalData.GetSnapshot(snapObj);
reply["str_response_string"] = response.OuterXml; reply["str_response_string"] = response.OuterXml;
reply["int_response_code"] = statuscode; reply["int_response_code"] = statuscode;
reply["content_type"] = "text/xml"; reply["content_type"] = "text/xml";
return reply; return reply;
} }
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,68 +1,68 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Modules.LandManagement; using OpenSim.Region.Environment.Modules.LandManagement;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {
public class EstateSnapshot : IDataSnapshotProvider public class EstateSnapshot : IDataSnapshotProvider
{ {
private Scene m_scene = null; private Scene m_scene = null;
private DataSnapshotManager m_parent = null; private DataSnapshotManager m_parent = null;
#region IDataSnapshotProvider Members #region IDataSnapshotProvider Members
public XmlNode RequestSnapshotData(XmlDocument factory) public XmlNode RequestSnapshotData(XmlDocument factory)
{ {
//Estate data section - contains who owns a set of sims and the name of the set. //Estate data section - contains who owns a set of sims and the name of the set.
//In Opensim all the estate names are the same as the Master Avatar (owner of the sim) //In Opensim all the estate names are the same as the Master Avatar (owner of the sim)
//Now in DataSnapshotProvider module form! //Now in DataSnapshotProvider module form!
XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", "");
LLUUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID; LLUUID ownerid = m_scene.RegionInfo.MasterAvatarAssignedUUID;
//TODO: Change to query userserver about the master avatar UUID ? //TODO: Change to query userserver about the master avatar UUID ?
String firstname = m_scene.RegionInfo.MasterAvatarFirstName; String firstname = m_scene.RegionInfo.MasterAvatarFirstName;
String lastname = m_scene.RegionInfo.MasterAvatarLastName; String lastname = m_scene.RegionInfo.MasterAvatarLastName;
//TODO: Fix the marshalling system to have less copypasta gruntwork //TODO: Fix the marshalling system to have less copypasta gruntwork
XmlNode user = factory.CreateNode(XmlNodeType.Element, "user", ""); XmlNode user = factory.CreateNode(XmlNodeType.Element, "user", "");
XmlAttribute type = (XmlAttribute)factory.CreateNode(XmlNodeType.Attribute, "type", ""); XmlAttribute type = (XmlAttribute)factory.CreateNode(XmlNodeType.Attribute, "type", "");
type.Value = "owner"; type.Value = "owner";
user.Attributes.Append(type); user.Attributes.Append(type);
//TODO: Create more TODOs //TODO: Create more TODOs
XmlNode username = factory.CreateNode(XmlNodeType.Element, "name", ""); XmlNode username = factory.CreateNode(XmlNodeType.Element, "name", "");
username.InnerText = firstname + " " + lastname; username.InnerText = firstname + " " + lastname;
user.AppendChild(username); user.AppendChild(username);
XmlNode useruuid = factory.CreateNode(XmlNodeType.Element, "uuid", ""); XmlNode useruuid = factory.CreateNode(XmlNodeType.Element, "uuid", "");
useruuid.InnerText = ownerid.ToString(); useruuid.InnerText = ownerid.ToString();
user.AppendChild(useruuid); user.AppendChild(useruuid);
estatedata.AppendChild(user); estatedata.AppendChild(user);
return estatedata; return estatedata;
} }
public void Initialize(Scene scene, DataSnapshotManager parent) public void Initialize(Scene scene, DataSnapshotManager parent)
{ {
m_scene = scene; m_scene = scene;
m_parent = parent; m_parent = parent;
} }
public Scene GetParentScene public Scene GetParentScene
{ {
get { return m_scene; } get { return m_scene; }
} }
#endregion #endregion
} }
} }

View File

@ -1,48 +1,48 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using libsecondlife; using libsecondlife;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {
public interface IDataSnapshotProvider public interface IDataSnapshotProvider
{ {
XmlNode RequestSnapshotData(XmlDocument document); XmlNode RequestSnapshotData(XmlDocument document);
//void PrepareData(); //void PrepareData();
void Initialize(Scene scene, DataSnapshotManager parent); void Initialize(Scene scene, DataSnapshotManager parent);
Scene GetParentScene { get; } Scene GetParentScene { get; }
} }
} }

View File

@ -1,267 +1,267 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using System.Reflection; using System.Reflection;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Modules.LandManagement; using OpenSim.Region.Environment.Modules.LandManagement;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {
public class LandSnapshot : IDataSnapshotProvider public class LandSnapshot : IDataSnapshotProvider
{ {
private Scene m_scene = null; private Scene m_scene = null;
private DataSnapshotManager m_parent = null; private DataSnapshotManager m_parent = null;
//private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>(); //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>();
private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
#region Dead code #region Dead code
/* /*
* David, I don't think we need this at all. When we do the snapshot, we can * David, I don't think we need this at all. When we do the snapshot, we can
* simply look into the parcels that are marked for ShowDirectory -- see * simply look into the parcels that are marked for ShowDirectory -- see
* conditional in RequestSnapshotData * conditional in RequestSnapshotData
* *
//Revise this, look for more direct way of checking for change in land //Revise this, look for more direct way of checking for change in land
#region Client hooks #region Client hooks
public void OnNewClient(IClientAPI client) public void OnNewClient(IClientAPI client)
{ {
//Land hooks //Land hooks
client.OnParcelDivideRequest += ParcelSplitHook; client.OnParcelDivideRequest += ParcelSplitHook;
client.OnParcelJoinRequest += ParcelSplitHook; client.OnParcelJoinRequest += ParcelSplitHook;
client.OnParcelPropertiesUpdateRequest += ParcelPropsHook; client.OnParcelPropertiesUpdateRequest += ParcelPropsHook;
} }
public void ParcelSplitHook(int west, int south, int east, int north, IClientAPI remote_client) public void ParcelSplitHook(int west, int south, int east, int north, IClientAPI remote_client)
{ {
PrepareData(); PrepareData();
} }
public void ParcelPropsHook(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client) public void ParcelPropsHook(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
{ {
PrepareData(); PrepareData();
} }
#endregion #endregion
public void PrepareData() public void PrepareData()
{ {
m_log.Info("[EXTERNALDATA]: Generating land data."); m_log.Info("[EXTERNALDATA]: Generating land data.");
m_landIndexed.Clear(); m_landIndexed.Clear();
//Index sim land //Index sim land
foreach (KeyValuePair<int, Land> curLand in m_scene.LandManager.landList) foreach (KeyValuePair<int, Land> curLand in m_scene.LandManager.landList)
{ {
//if ((curLand.Value.landData.landFlags & (uint)Parcel.ParcelFlags.ShowDirectory) == (uint)Parcel.ParcelFlags.ShowDirectory) //if ((curLand.Value.landData.landFlags & (uint)Parcel.ParcelFlags.ShowDirectory) == (uint)Parcel.ParcelFlags.ShowDirectory)
//{ //{
m_landIndexed.Add(curLand.Key, curLand.Value.Copy()); m_landIndexed.Add(curLand.Key, curLand.Value.Copy());
//} //}
} }
} }
public Dictionary<int,Land> IndexedLand { public Dictionary<int,Land> IndexedLand {
get { return m_landIndexed; } get { return m_landIndexed; }
} }
*/ */
#endregion #endregion
#region IDataSnapshotProvider members #region IDataSnapshotProvider members
public void Initialize(Scene scene, DataSnapshotManager parent) public void Initialize(Scene scene, DataSnapshotManager parent)
{ {
m_scene = scene; m_scene = scene;
m_parent = parent; m_parent = parent;
//m_scene.EventManager.OnNewClient += OnNewClient; //m_scene.EventManager.OnNewClient += OnNewClient;
} }
public Scene GetParentScene public Scene GetParentScene
{ {
get { return m_scene; } get { return m_scene; }
} }
public XmlNode RequestSnapshotData(XmlDocument nodeFactory) public XmlNode RequestSnapshotData(XmlDocument nodeFactory)
{ {
ILandChannel landChannel = (LandChannel)m_scene.LandChannel; ILandChannel landChannel = (LandChannel)m_scene.LandChannel;
Dictionary<int, ILandObject> landList = null; Dictionary<int, ILandObject> landList = null;
try try
{ {
Type landChannelType = typeof(LandChannel); Type landChannelType = typeof(LandChannel);
FieldInfo landListField = landChannelType.GetField("landList", BindingFlags.NonPublic | BindingFlags.Instance); FieldInfo landListField = landChannelType.GetField("landList", BindingFlags.NonPublic | BindingFlags.Instance);
if (landListField != null) if (landListField != null)
{ {
landList = (Dictionary<int, ILandObject>)landListField.GetValue(landChannel); landList = (Dictionary<int, ILandObject>)landListField.GetValue(landChannel);
} }
} }
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine("[DATASNAPSHOT] couldn't access field reflectively\n" + e.ToString()); Console.WriteLine("[DATASNAPSHOT] couldn't access field reflectively\n" + e.ToString());
} }
XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", ""); XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "parceldata", "");
if (landList != null) if (landList != null)
{ {
//foreach (KeyValuePair<int, Land> curParcel in m_landIndexed) //foreach (KeyValuePair<int, Land> curParcel in m_landIndexed)
foreach (LandObject land in landList.Values) foreach (LandObject land in landList.Values)
{ {
LandData parcel = land.landData; LandData parcel = land.landData;
if ((parcel.landFlags & (uint)Parcel.ParcelFlags.ShowDirectory) == (uint)Parcel.ParcelFlags.ShowDirectory) if ((parcel.landFlags & (uint)Parcel.ParcelFlags.ShowDirectory) == (uint)Parcel.ParcelFlags.ShowDirectory)
{ {
//TODO: make better method of marshalling data from LandData to XmlNode //TODO: make better method of marshalling data from LandData to XmlNode
XmlNode xmlparcel = nodeFactory.CreateNode(XmlNodeType.Element, "parcel", ""); XmlNode xmlparcel = nodeFactory.CreateNode(XmlNodeType.Element, "parcel", "");
// Attributes of the parcel node // Attributes of the parcel node
XmlAttribute scripts_attr = nodeFactory.CreateAttribute("scripts"); XmlAttribute scripts_attr = nodeFactory.CreateAttribute("scripts");
scripts_attr.Value = GetScriptsPermissions(parcel); scripts_attr.Value = GetScriptsPermissions(parcel);
XmlAttribute category_attr = nodeFactory.CreateAttribute("category"); XmlAttribute category_attr = nodeFactory.CreateAttribute("category");
category_attr.Value = parcel.category.ToString(); category_attr.Value = parcel.category.ToString();
//XmlAttribute entities_attr = nodeFactory.CreateAttribute("entities"); //XmlAttribute entities_attr = nodeFactory.CreateAttribute("entities");
//entities_attr.Value = land.primsOverMe.Count.ToString(); //entities_attr.Value = land.primsOverMe.Count.ToString();
xmlparcel.Attributes.Append(scripts_attr); xmlparcel.Attributes.Append(scripts_attr);
xmlparcel.Attributes.Append(category_attr); xmlparcel.Attributes.Append(category_attr);
//xmlparcel.Attributes.Append(entities_attr); //xmlparcel.Attributes.Append(entities_attr);
//name, description, area, and UUID //name, description, area, and UUID
XmlNode name = nodeFactory.CreateNode(XmlNodeType.Element, "name", ""); XmlNode name = nodeFactory.CreateNode(XmlNodeType.Element, "name", "");
name.InnerText = parcel.landName; name.InnerText = parcel.landName;
xmlparcel.AppendChild(name); xmlparcel.AppendChild(name);
XmlNode desc = nodeFactory.CreateNode(XmlNodeType.Element, "description", ""); XmlNode desc = nodeFactory.CreateNode(XmlNodeType.Element, "description", "");
desc.InnerText = parcel.landDesc; desc.InnerText = parcel.landDesc;
xmlparcel.AppendChild(desc); xmlparcel.AppendChild(desc);
XmlNode uuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); XmlNode uuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
uuid.InnerText = parcel.globalID.ToString(); uuid.InnerText = parcel.globalID.ToString();
xmlparcel.AppendChild(uuid); xmlparcel.AppendChild(uuid);
XmlNode area = nodeFactory.CreateNode(XmlNodeType.Element, "area", ""); XmlNode area = nodeFactory.CreateNode(XmlNodeType.Element, "area", "");
area.InnerText = parcel.area.ToString(); area.InnerText = parcel.area.ToString();
xmlparcel.AppendChild(area); xmlparcel.AppendChild(area);
//default location //default location
XmlNode tpLocation = nodeFactory.CreateNode(XmlNodeType.Element, "location", ""); XmlNode tpLocation = nodeFactory.CreateNode(XmlNodeType.Element, "location", "");
LLVector3 loc = parcel.userLocation; LLVector3 loc = parcel.userLocation;
if (loc.Equals(LLVector3.Zero)) // This test is mute at this point: the location is wrong by default if (loc.Equals(LLVector3.Zero)) // This test is mute at this point: the location is wrong by default
loc = new LLVector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2); loc = new LLVector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2);
tpLocation.InnerText = loc.X.ToString() + "/" + loc.Y.ToString() + "/" + loc.Z.ToString(); tpLocation.InnerText = loc.X.ToString() + "/" + loc.Y.ToString() + "/" + loc.Z.ToString();
xmlparcel.AppendChild(tpLocation); xmlparcel.AppendChild(tpLocation);
//TODO: figure how to figure out teleport system landData.landingType //TODO: figure how to figure out teleport system landData.landingType
//land texture snapshot uuid //land texture snapshot uuid
if (parcel.snapshotID != LLUUID.Zero) if (parcel.snapshotID != LLUUID.Zero)
{ {
XmlNode textureuuid = nodeFactory.CreateNode(XmlNodeType.Element, "image", ""); XmlNode textureuuid = nodeFactory.CreateNode(XmlNodeType.Element, "image", "");
textureuuid.InnerText = parcel.snapshotID.ToString(); textureuuid.InnerText = parcel.snapshotID.ToString();
xmlparcel.AppendChild(textureuuid); xmlparcel.AppendChild(textureuuid);
} }
//attached user and group //attached user and group
if (parcel.groupID != LLUUID.Zero) if (parcel.groupID != LLUUID.Zero)
{ {
XmlNode groupblock = nodeFactory.CreateNode(XmlNodeType.Element, "group", ""); XmlNode groupblock = nodeFactory.CreateNode(XmlNodeType.Element, "group", "");
XmlNode groupuuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); XmlNode groupuuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
groupuuid.InnerText = parcel.groupID.ToString(); groupuuid.InnerText = parcel.groupID.ToString();
groupblock.AppendChild(groupuuid); groupblock.AppendChild(groupuuid);
//No name yet, there's no way to get a group name since they don't exist yet. //No name yet, there's no way to get a group name since they don't exist yet.
//TODO: When groups are supported, add the group handling code. //TODO: When groups are supported, add the group handling code.
xmlparcel.AppendChild(groupblock); xmlparcel.AppendChild(groupblock);
} }
if (!parcel.isGroupOwned) if (!parcel.isGroupOwned)
{ {
XmlNode userblock = nodeFactory.CreateNode(XmlNodeType.Element, "owner", ""); XmlNode userblock = nodeFactory.CreateNode(XmlNodeType.Element, "owner", "");
LLUUID userOwnerUUID = parcel.ownerID; LLUUID userOwnerUUID = parcel.ownerID;
XmlNode useruuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); XmlNode useruuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
useruuid.InnerText = userOwnerUUID.ToString(); useruuid.InnerText = userOwnerUUID.ToString();
userblock.AppendChild(useruuid); userblock.AppendChild(useruuid);
try try
{ {
XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", ""); XmlNode username = nodeFactory.CreateNode(XmlNodeType.Element, "name", "");
UserProfileData userProfile = m_scene.CommsManager.UserService.GetUserProfile(userOwnerUUID); UserProfileData userProfile = m_scene.CommsManager.UserService.GetUserProfile(userOwnerUUID);
username.InnerText = userProfile.username + " " + userProfile.surname; username.InnerText = userProfile.username + " " + userProfile.surname;
userblock.AppendChild(username); userblock.AppendChild(username);
} }
catch (Exception) catch (Exception)
{ {
m_log.Info("[DATASNAPSHOT]: Cannot find owner name; ignoring this parcel"); m_log.Info("[DATASNAPSHOT]: Cannot find owner name; ignoring this parcel");
} }
xmlparcel.AppendChild(userblock); xmlparcel.AppendChild(userblock);
} }
//else //else
//{ //{
// XmlAttribute type = (XmlAttribute)nodeFactory.CreateNode(XmlNodeType.Attribute, "type", ""); // XmlAttribute type = (XmlAttribute)nodeFactory.CreateNode(XmlNodeType.Attribute, "type", "");
// type.InnerText = "owner"; // type.InnerText = "owner";
// groupblock.Attributes.Append(type); // groupblock.Attributes.Append(type);
//} //}
parent.AppendChild(xmlparcel); parent.AppendChild(xmlparcel);
} }
} }
//snap.AppendChild(parent); //snap.AppendChild(parent);
} }
return parent; return parent;
} }
#endregion #endregion
#region Helper functions #region Helper functions
private string GetScriptsPermissions(LandData parcel) private string GetScriptsPermissions(LandData parcel)
{ {
if ((parcel.landFlags & (uint)Parcel.ParcelFlags.AllowOtherScripts) == (uint)Parcel.ParcelFlags.AllowOtherScripts) if ((parcel.landFlags & (uint)Parcel.ParcelFlags.AllowOtherScripts) == (uint)Parcel.ParcelFlags.AllowOtherScripts)
return "yes"; return "yes";
else else
return "no"; return "no";
} }
#endregion #endregion
} }
} }

View File

@ -1,83 +1,83 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Xml; using System.Xml;
using System.Reflection; using System.Reflection;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework; using OpenSim.Framework;
using libsecondlife; using libsecondlife;
namespace OpenSim.Region.DataSnapshot namespace OpenSim.Region.DataSnapshot
{ {
public class ObjectSnapshot : IDataSnapshotProvider public class ObjectSnapshot : IDataSnapshotProvider
{ {
private Scene m_scene = null; private Scene m_scene = null;
private DataSnapshotManager m_parent = null; private DataSnapshotManager m_parent = null;
private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public void Initialize(Scene scene, DataSnapshotManager parent) public void Initialize(Scene scene, DataSnapshotManager parent)
{ {
m_scene = scene; m_scene = scene;
m_parent = parent; m_parent = parent;
} }
public Scene GetParentScene public Scene GetParentScene
{ {
get { return m_scene; } get { return m_scene; }
} }
public XmlNode RequestSnapshotData(XmlDocument nodeFactory) public XmlNode RequestSnapshotData(XmlDocument nodeFactory)
{ {
XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "objectdata", ""); XmlNode parent = nodeFactory.CreateNode(XmlNodeType.Element, "objectdata", "");
XmlNode node; XmlNode node;
#if LIBSL_IS_FIXED #if LIBSL_IS_FIXED
foreach (EntityBase entity in m_scene.Entities.Values) foreach (EntityBase entity in m_scene.Entities.Values)
{ {
// only objects, not avatars // only objects, not avatars
if (entity is SceneObjectGroup) if (entity is SceneObjectGroup)
{ {
SceneObjectGroup obj = (SceneObjectGroup)entity; SceneObjectGroup obj = (SceneObjectGroup)entity;
XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", ""); XmlNode xmlobject = nodeFactory.CreateNode(XmlNodeType.Element, "object", "");
node = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); node = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", "");
node.InnerText = obj.UUID.ToString(); node.InnerText = obj.UUID.ToString();
xmlobject.AppendChild(node); xmlobject.AppendChild(node);
SceneObjectPart m_rootPart = null; SceneObjectPart m_rootPart = null;
try try
{ {
Type sog = typeof(SceneObjectGroup); Type sog = typeof(SceneObjectGroup);
FieldInfo rootField = sog.GetField("m_rootPart", BindingFlags.NonPublic | BindingFlags.Instance); FieldInfo rootField = sog.GetField("m_rootPart", BindingFlags.NonPublic | BindingFlags.Instance);
if (rootField != null) if (rootField != null)
{ {
m_rootPart = (SceneObjectPart)rootField.GetValue(obj); m_rootPart = (SceneObjectPart)rootField.GetValue(obj);
} }
} }
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine("[DATASNAPSHOT] couldn't access field reflectively\n" + e.ToString()); Console.WriteLine("[DATASNAPSHOT] couldn't access field reflectively\n" + e.ToString());
} }
if (m_rootPart != null) if (m_rootPart != null)
{ {
node = nodeFactory.CreateNode(XmlNodeType.Element, "title", ""); node = nodeFactory.CreateNode(XmlNodeType.Element, "title", "");
node.InnerText = m_rootPart.Name; node.InnerText = m_rootPart.Name;
xmlobject.AppendChild(node); xmlobject.AppendChild(node);
node = nodeFactory.CreateNode(XmlNodeType.Element, "description", ""); node = nodeFactory.CreateNode(XmlNodeType.Element, "description", "");
node.InnerText = m_rootPart.Description; node.InnerText = m_rootPart.Description;
xmlobject.AppendChild(node); xmlobject.AppendChild(node);
node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", ""); node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", "");
node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags); node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags);
xmlobject.AppendChild(node); xmlobject.AppendChild(node);
} }
parent.AppendChild(xmlobject); parent.AppendChild(xmlobject);
} }
} }
#endif #endif
return parent; return parent;
} }
} }
} }

View File

@ -1,164 +1,164 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://microsoft.com/wsdl/types/" /> <xs:import namespace="http://microsoft.com/wsdl/types/" />
<xs:import namespace="http://www.w3.org/2001/XMLSchema" /> <xs:import namespace="http://www.w3.org/2001/XMLSchema" />
<xs:element name="SceneObjectPart" nillable="true" type="SceneObjectPart" /> <xs:element name="SceneObjectPart" nillable="true" type="SceneObjectPart" />
<xs:complexType name="SceneObjectPart"> <xs:complexType name="SceneObjectPart">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="LastOwnerID" type="LLUUID" /> <xs:element minOccurs="1" maxOccurs="1" name="LastOwnerID" type="LLUUID" />
<xs:element minOccurs="1" maxOccurs="1" name="OwnerID" type="LLUUID" /> <xs:element minOccurs="1" maxOccurs="1" name="OwnerID" type="LLUUID" />
<xs:element minOccurs="1" maxOccurs="1" name="GroupID" type="LLUUID" /> <xs:element minOccurs="1" maxOccurs="1" name="GroupID" type="LLUUID" />
<xs:element minOccurs="1" maxOccurs="1" name="OwnershipCost" type="xs:int" /> <xs:element minOccurs="1" maxOccurs="1" name="OwnershipCost" type="xs:int" />
<xs:element minOccurs="1" maxOccurs="1" name="ObjectSaleType" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="ObjectSaleType" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="SalePrice" type="xs:int" /> <xs:element minOccurs="1" maxOccurs="1" name="SalePrice" type="xs:int" />
<xs:element minOccurs="1" maxOccurs="1" name="Category" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="Category" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="CreationDate" type="xs:int" /> <xs:element minOccurs="1" maxOccurs="1" name="CreationDate" type="xs:int" />
<xs:element minOccurs="1" maxOccurs="1" name="ParentID" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="ParentID" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="BaseMask" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="BaseMask" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="OwnerMask" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="OwnerMask" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="GroupMask" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="GroupMask" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="EveryoneMask" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="EveryoneMask" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="NextOwnerMask" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="NextOwnerMask" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="Flags" type="ObjectFlags" /> <xs:element minOccurs="1" maxOccurs="1" name="Flags" type="ObjectFlags" />
<xs:element minOccurs="1" maxOccurs="1" name="CreatorID" type="LLUUID" /> <xs:element minOccurs="1" maxOccurs="1" name="CreatorID" type="LLUUID" />
<xs:element minOccurs="1" maxOccurs="1" name="ObjectFlags" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="ObjectFlags" type="xs:unsignedInt" />
<xs:element minOccurs="1" maxOccurs="1" name="UUID" type="LLUUID" /> <xs:element minOccurs="1" maxOccurs="1" name="UUID" type="LLUUID" />
<xs:element minOccurs="1" maxOccurs="1" name="LocalId" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="LocalId" type="xs:unsignedInt" />
<xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" /> <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" />
<xs:element minOccurs="1" maxOccurs="1" name="Material" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="Material" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="RegionHandle" type="xs:unsignedLong" /> <xs:element minOccurs="1" maxOccurs="1" name="RegionHandle" type="xs:unsignedLong" />
<xs:element minOccurs="1" maxOccurs="1" name="GroupPosition" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="GroupPosition" type="LLVector3" />
<xs:element minOccurs="1" maxOccurs="1" name="OffsetPosition" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="OffsetPosition" type="LLVector3" />
<xs:element minOccurs="1" maxOccurs="1" name="RotationOffset" type="LLQuaternion" /> <xs:element minOccurs="1" maxOccurs="1" name="RotationOffset" type="LLQuaternion" />
<xs:element minOccurs="1" maxOccurs="1" name="Velocity" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="Velocity" type="LLVector3" />
<xs:element minOccurs="1" maxOccurs="1" name="RotationalVelocity" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="RotationalVelocity" type="LLVector3" />
<xs:element minOccurs="1" maxOccurs="1" name="AngularVelocity" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="AngularVelocity" type="LLVector3" />
<xs:element minOccurs="1" maxOccurs="1" name="Acceleration" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="Acceleration" type="LLVector3" />
<xs:element minOccurs="0" maxOccurs="1" name="Description" type="xs:string" /> <xs:element minOccurs="0" maxOccurs="1" name="Description" type="xs:string" />
<xs:element minOccurs="1" maxOccurs="1" name="Color" type="Color" /> <xs:element minOccurs="1" maxOccurs="1" name="Color" type="Color" />
<xs:element minOccurs="0" maxOccurs="1" name="Text" type="xs:string" /> <xs:element minOccurs="0" maxOccurs="1" name="Text" type="xs:string" />
<xs:element minOccurs="0" maxOccurs="1" name="SitName" type="xs:string" /> <xs:element minOccurs="0" maxOccurs="1" name="SitName" type="xs:string" />
<xs:element minOccurs="0" maxOccurs="1" name="TouchName" type="xs:string" /> <xs:element minOccurs="0" maxOccurs="1" name="TouchName" type="xs:string" />
<xs:element minOccurs="1" maxOccurs="1" name="LinkNum" type="xs:int" /> <xs:element minOccurs="1" maxOccurs="1" name="LinkNum" type="xs:int" />
<xs:element minOccurs="1" maxOccurs="1" name="ClickAction" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="ClickAction" type="xs:unsignedByte" />
<xs:element minOccurs="0" maxOccurs="1" name="Shape" type="PrimitiveBaseShape" /> <xs:element minOccurs="0" maxOccurs="1" name="Shape" type="PrimitiveBaseShape" />
<xs:element minOccurs="1" maxOccurs="1" name="Scale" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="Scale" type="LLVector3" />
<xs:element minOccurs="1" maxOccurs="1" name="UpdateFlag" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="UpdateFlag" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="FolderID" type="LLUUID" /> <xs:element minOccurs="1" maxOccurs="1" name="FolderID" type="LLUUID" />
<xs:element minOccurs="1" maxOccurs="1" name="InventorySerial" type="xs:unsignedInt" /> <xs:element minOccurs="1" maxOccurs="1" name="InventorySerial" type="xs:unsignedInt" />
<xs:element minOccurs="0" maxOccurs="1" name="TaskInventory"> <xs:element minOccurs="0" maxOccurs="1" name="TaskInventory">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element ref="xs:schema" /> <xs:element ref="xs:schema" />
<xs:any /> <xs:any />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="LLUUID"> <xs:complexType name="LLUUID">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="UUID" xmlns:q1="http://microsoft.com/wsdl/types/" type="q1:guid" /> <xs:element minOccurs="1" maxOccurs="1" name="UUID" xmlns:q1="http://microsoft.com/wsdl/types/" type="q1:guid" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="ObjectFlags"> <xs:simpleType name="ObjectFlags">
<xs:list> <xs:list>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value="None" /> <xs:enumeration value="None" />
<xs:enumeration value="Physics" /> <xs:enumeration value="Physics" />
<xs:enumeration value="CreateSelected" /> <xs:enumeration value="CreateSelected" />
<xs:enumeration value="ObjectModify" /> <xs:enumeration value="ObjectModify" />
<xs:enumeration value="ObjectCopy" /> <xs:enumeration value="ObjectCopy" />
<xs:enumeration value="ObjectAnyOwner" /> <xs:enumeration value="ObjectAnyOwner" />
<xs:enumeration value="ObjectYouOwner" /> <xs:enumeration value="ObjectYouOwner" />
<xs:enumeration value="Scripted" /> <xs:enumeration value="Scripted" />
<xs:enumeration value="Touch" /> <xs:enumeration value="Touch" />
<xs:enumeration value="ObjectMove" /> <xs:enumeration value="ObjectMove" />
<xs:enumeration value="Money" /> <xs:enumeration value="Money" />
<xs:enumeration value="Phantom" /> <xs:enumeration value="Phantom" />
<xs:enumeration value="InventoryEmpty" /> <xs:enumeration value="InventoryEmpty" />
<xs:enumeration value="JointHinge" /> <xs:enumeration value="JointHinge" />
<xs:enumeration value="JointP2P" /> <xs:enumeration value="JointP2P" />
<xs:enumeration value="JointLP2P" /> <xs:enumeration value="JointLP2P" />
<xs:enumeration value="JointWheel" /> <xs:enumeration value="JointWheel" />
<xs:enumeration value="AllowInventoryDrop" /> <xs:enumeration value="AllowInventoryDrop" />
<xs:enumeration value="ObjectTransfer" /> <xs:enumeration value="ObjectTransfer" />
<xs:enumeration value="ObjectGroupOwned" /> <xs:enumeration value="ObjectGroupOwned" />
<xs:enumeration value="ObjectYouOfficer" /> <xs:enumeration value="ObjectYouOfficer" />
<xs:enumeration value="CameraDecoupled" /> <xs:enumeration value="CameraDecoupled" />
<xs:enumeration value="AnimSource" /> <xs:enumeration value="AnimSource" />
<xs:enumeration value="CameraSource" /> <xs:enumeration value="CameraSource" />
<xs:enumeration value="CastShadows" /> <xs:enumeration value="CastShadows" />
<xs:enumeration value="ObjectOwnerModify" /> <xs:enumeration value="ObjectOwnerModify" />
<xs:enumeration value="TemporaryOnRez" /> <xs:enumeration value="TemporaryOnRez" />
<xs:enumeration value="Temporary" /> <xs:enumeration value="Temporary" />
<xs:enumeration value="ZlibCompressed" /> <xs:enumeration value="ZlibCompressed" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:list> </xs:list>
</xs:simpleType> </xs:simpleType>
<xs:complexType name="LLVector3"> <xs:complexType name="LLVector3">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="X" type="xs:float" /> <xs:element minOccurs="1" maxOccurs="1" name="X" type="xs:float" />
<xs:element minOccurs="1" maxOccurs="1" name="Y" type="xs:float" /> <xs:element minOccurs="1" maxOccurs="1" name="Y" type="xs:float" />
<xs:element minOccurs="1" maxOccurs="1" name="Z" type="xs:float" /> <xs:element minOccurs="1" maxOccurs="1" name="Z" type="xs:float" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="LLQuaternion"> <xs:complexType name="LLQuaternion">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="1" maxOccurs="1" name="X" type="xs:float" /> <xs:element minOccurs="1" maxOccurs="1" name="X" type="xs:float" />
<xs:element minOccurs="1" maxOccurs="1" name="Y" type="xs:float" /> <xs:element minOccurs="1" maxOccurs="1" name="Y" type="xs:float" />
<xs:element minOccurs="1" maxOccurs="1" name="Z" type="xs:float" /> <xs:element minOccurs="1" maxOccurs="1" name="Z" type="xs:float" />
<xs:element minOccurs="1" maxOccurs="1" name="W" type="xs:float" /> <xs:element minOccurs="1" maxOccurs="1" name="W" type="xs:float" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="Color" /> <xs:complexType name="Color" />
<xs:complexType name="PrimitiveBaseShape"> <xs:complexType name="PrimitiveBaseShape">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" maxOccurs="1" name="ExtraParams" type="xs:base64Binary" /> <xs:element minOccurs="0" maxOccurs="1" name="ExtraParams" type="xs:base64Binary" />
<xs:element minOccurs="1" maxOccurs="1" name="PathBegin" type="xs:unsignedShort" /> <xs:element minOccurs="1" maxOccurs="1" name="PathBegin" type="xs:unsignedShort" />
<xs:element minOccurs="1" maxOccurs="1" name="PathCurve" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathCurve" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathEnd" type="xs:unsignedShort" /> <xs:element minOccurs="1" maxOccurs="1" name="PathEnd" type="xs:unsignedShort" />
<xs:element minOccurs="1" maxOccurs="1" name="PathRadiusOffset" type="xs:byte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathRadiusOffset" type="xs:byte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathRevolutions" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathRevolutions" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathScaleX" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathScaleX" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathScaleY" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathScaleY" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathShearX" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathShearX" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathShearY" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathShearY" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathSkew" type="xs:byte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathSkew" type="xs:byte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathTaperX" type="xs:byte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathTaperX" type="xs:byte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathTaperY" type="xs:byte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathTaperY" type="xs:byte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathTwist" type="xs:byte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathTwist" type="xs:byte" />
<xs:element minOccurs="1" maxOccurs="1" name="PathTwistBegin" type="xs:byte" /> <xs:element minOccurs="1" maxOccurs="1" name="PathTwistBegin" type="xs:byte" />
<xs:element minOccurs="1" maxOccurs="1" name="PCode" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="PCode" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="ProfileBegin" type="xs:unsignedShort" /> <xs:element minOccurs="1" maxOccurs="1" name="ProfileBegin" type="xs:unsignedShort" />
<xs:element minOccurs="1" maxOccurs="1" name="ProfileCurve" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="ProfileCurve" type="xs:unsignedByte" />
<xs:element minOccurs="1" maxOccurs="1" name="ProfileEnd" type="xs:unsignedShort" /> <xs:element minOccurs="1" maxOccurs="1" name="ProfileEnd" type="xs:unsignedShort" />
<xs:element minOccurs="1" maxOccurs="1" name="ProfileHollow" type="xs:unsignedShort" /> <xs:element minOccurs="1" maxOccurs="1" name="ProfileHollow" type="xs:unsignedShort" />
<xs:element minOccurs="1" maxOccurs="1" name="Scale" type="LLVector3" /> <xs:element minOccurs="1" maxOccurs="1" name="Scale" type="LLVector3" />
<xs:element minOccurs="1" maxOccurs="1" name="State" type="xs:unsignedByte" /> <xs:element minOccurs="1" maxOccurs="1" name="State" type="xs:unsignedByte" />
<xs:element minOccurs="0" maxOccurs="1" name="TextureEntry" type="xs:base64Binary" /> <xs:element minOccurs="0" maxOccurs="1" name="TextureEntry" type="xs:base64Binary" />
<xs:element minOccurs="1" maxOccurs="1" name="ProfileShape" type="ProfileShape" /> <xs:element minOccurs="1" maxOccurs="1" name="ProfileShape" type="ProfileShape" />
<xs:element minOccurs="1" maxOccurs="1" name="HollowShape" type="HollowShape" /> <xs:element minOccurs="1" maxOccurs="1" name="HollowShape" type="HollowShape" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="ProfileShape"> <xs:simpleType name="ProfileShape">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value="Circle" /> <xs:enumeration value="Circle" />
<xs:enumeration value="Square" /> <xs:enumeration value="Square" />
<xs:enumeration value="IsometricTriangle" /> <xs:enumeration value="IsometricTriangle" />
<xs:enumeration value="EquilateralTriangle" /> <xs:enumeration value="EquilateralTriangle" />
<xs:enumeration value="RightTriangle" /> <xs:enumeration value="RightTriangle" />
<xs:enumeration value="HalfCircle" /> <xs:enumeration value="HalfCircle" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="HollowShape"> <xs:simpleType name="HollowShape">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:enumeration value="Same" /> <xs:enumeration value="Same" />
<xs:enumeration value="Circle" /> <xs:enumeration value="Circle" />
<xs:enumeration value="Square" /> <xs:enumeration value="Square" />
<xs:enumeration value="Triangle" /> <xs:enumeration value="Triangle" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:schema> </xs:schema>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:tns="http://microsoft.com/wsdl/types/" elementFormDefault="qualified" targetNamespace="http://microsoft.com/wsdl/types/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:schema xmlns:tns="http://microsoft.com/wsdl/types/" elementFormDefault="qualified" targetNamespace="http://microsoft.com/wsdl/types/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:simpleType name="guid"> <xs:simpleType name="guid">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" /> <xs:pattern value="[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:schema> </xs:schema>