diff options
author | Justin Clarke Casey | 2009-03-05 18:36:37 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-05 18:36:37 +0000 |
commit | 0de34e9a183d596dc051fa708517dcb99a35abae (patch) | |
tree | 0075b425d89811d4b4548995a0ac2487c59d2871 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Make DeserializeUUID explicitly private. (diff) | |
download | opensim-SC-0de34e9a183d596dc051fa708517dcb99a35abae.zip opensim-SC-0de34e9a183d596dc051fa708517dcb99a35abae.tar.gz opensim-SC-0de34e9a183d596dc051fa708517dcb99a35abae.tar.bz2 opensim-SC-0de34e9a183d596dc051fa708517dcb99a35abae.tar.xz |
* remove now unused serialization code
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 125 |
1 files changed, 1 insertions, 124 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 5b0480f..ede007e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -92,8 +92,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
92 | 92 | ||
93 | #endregion Enumerations | 93 | #endregion Enumerations |
94 | 94 | ||
95 | [Serializable] | 95 | public class SceneObjectPart : IScriptHost |
96 | public class SceneObjectPart : IScriptHost, ISerializable | ||
97 | { | 96 | { |
98 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 97 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
99 | 98 | ||
@@ -318,27 +317,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
318 | m_inventory = new SceneObjectPartInventory(this); | 317 | m_inventory = new SceneObjectPartInventory(this); |
319 | } | 318 | } |
320 | 319 | ||
321 | protected SceneObjectPart(SerializationInfo info, StreamingContext context) | ||
322 | { | ||
323 | //m_log.Debug("SceneObjectPart Deserialize BGN"); | ||
324 | m_TextureAnimation = new byte[0]; | ||
325 | m_particleSystem = new byte[0]; | ||
326 | if (info == null) | ||
327 | { | ||
328 | throw new ArgumentNullException("info"); | ||
329 | } | ||
330 | |||
331 | /* | ||
332 | m_queue = (Queue<SceneObjectPart>)info.GetValue("m_queue", typeof(Queue<SceneObjectPart>)); | ||
333 | m_ids = (List<UUID>)info.GetValue("m_ids", typeof(List<UUID>)); | ||
334 | */ | ||
335 | |||
336 | //m_log.Debug("SceneObjectPart Deserialize END"); | ||
337 | Rezzed = DateTime.Now; | ||
338 | |||
339 | m_inventory = new SceneObjectPartInventory(this); | ||
340 | } | ||
341 | |||
342 | #endregion Constructors | 320 | #endregion Constructors |
343 | 321 | ||
344 | #region XML Schema | 322 | #region XML Schema |
@@ -1699,107 +1677,6 @@ if (m_shape != null) { | |||
1699 | return new PhysicsVector(); | 1677 | return new PhysicsVector(); |
1700 | } | 1678 | } |
1701 | 1679 | ||
1702 | [SecurityPermission(SecurityAction.LinkDemand, | ||
1703 | Flags = SecurityPermissionFlag.SerializationFormatter)] | ||
1704 | public virtual void GetObjectData( | ||
1705 | SerializationInfo info, StreamingContext context) | ||
1706 | { | ||
1707 | if (info == null) | ||
1708 | { | ||
1709 | throw new ArgumentNullException("info"); | ||
1710 | } | ||
1711 | |||
1712 | info.AddValue("m_inventoryFileName", Inventory.GetInventoryFileName()); | ||
1713 | info.AddValue("m_folderID", UUID); | ||
1714 | info.AddValue("PhysActor", PhysActor); | ||
1715 | |||
1716 | Dictionary<Guid, TaskInventoryItem> TaskInventory_work = new Dictionary<Guid, TaskInventoryItem>(); | ||
1717 | |||
1718 | lock (TaskInventory) | ||
1719 | { | ||
1720 | foreach (UUID id in TaskInventory.Keys) | ||
1721 | { | ||
1722 | TaskInventory_work.Add(id.Guid, TaskInventory[id]); | ||
1723 | } | ||
1724 | } | ||
1725 | |||
1726 | info.AddValue("TaskInventory", TaskInventory_work); | ||
1727 | |||
1728 | info.AddValue("LastOwnerID", _lastOwnerID.Guid); | ||
1729 | info.AddValue("OwnerID", _ownerID.Guid); | ||
1730 | info.AddValue("GroupID", _groupID.Guid); | ||
1731 | |||
1732 | info.AddValue("OwnershipCost", _ownershipCost); | ||
1733 | info.AddValue("ObjectSaleType", _objectSaleType); | ||
1734 | info.AddValue("SalePrice", _salePrice); | ||
1735 | info.AddValue("Category", _category); | ||
1736 | |||
1737 | info.AddValue("CreationDate", _creationDate); | ||
1738 | info.AddValue("ParentID", _parentID); | ||
1739 | |||
1740 | info.AddValue("OwnerMask", _ownerMask); | ||
1741 | info.AddValue("NextOwnerMask", _nextOwnerMask); | ||
1742 | info.AddValue("GroupMask", _groupMask); | ||
1743 | info.AddValue("EveryoneMask", _everyoneMask); | ||
1744 | info.AddValue("BaseMask", _baseMask); | ||
1745 | |||
1746 | info.AddValue("m_particleSystem", m_particleSystem); | ||
1747 | |||
1748 | info.AddValue("TimeStampFull", TimeStampFull); | ||
1749 | info.AddValue("TimeStampTerse", TimeStampTerse); | ||
1750 | info.AddValue("TimeStampLastActivity", TimeStampLastActivity); | ||
1751 | |||
1752 | info.AddValue("m_updateFlag", m_updateFlag); | ||
1753 | info.AddValue("CreatorID", _creatorID.Guid); | ||
1754 | |||
1755 | info.AddValue("m_inventorySerial", m_inventory.Serial); | ||
1756 | info.AddValue("m_uuid", m_uuid.Guid); | ||
1757 | info.AddValue("m_localID", m_localId); | ||
1758 | info.AddValue("m_name", m_name); | ||
1759 | info.AddValue("m_flags", _flags); | ||
1760 | info.AddValue("m_material", m_material); | ||
1761 | info.AddValue("m_regionHandle", m_regionHandle); | ||
1762 | |||
1763 | info.AddValue("m_groupPosition.X", m_groupPosition.X); | ||
1764 | info.AddValue("m_groupPosition.Y", m_groupPosition.Y); | ||
1765 | info.AddValue("m_groupPosition.Z", m_groupPosition.Z); | ||
1766 | |||
1767 | info.AddValue("m_offsetPosition.X", m_offsetPosition.X); | ||
1768 | info.AddValue("m_offsetPosition.Y", m_offsetPosition.Y); | ||
1769 | info.AddValue("m_offsetPosition.Z", m_offsetPosition.Z); | ||
1770 | |||
1771 | info.AddValue("m_rotationOffset.W", m_rotationOffset.W); | ||
1772 | info.AddValue("m_rotationOffset.X", m_rotationOffset.X); | ||
1773 | info.AddValue("m_rotationOffset.Y", m_rotationOffset.Y); | ||
1774 | info.AddValue("m_rotationOffset.Z", m_rotationOffset.Z); | ||
1775 | |||
1776 | info.AddValue("m_velocity.X", m_velocity.X); | ||
1777 | info.AddValue("m_velocity.Y", m_velocity.Y); | ||
1778 | info.AddValue("m_velocity.Z", m_velocity.Z); | ||
1779 | |||
1780 | info.AddValue("m_rotationalvelocity.X", RotationalVelocity.X); | ||
1781 | info.AddValue("m_rotationalvelocity.Y", RotationalVelocity.Y); | ||
1782 | info.AddValue("m_rotationalvelocity.Z", RotationalVelocity.Z); | ||
1783 | |||
1784 | info.AddValue("m_angularVelocity.X", m_angularVelocity.X); | ||
1785 | info.AddValue("m_angularVelocity.Y", m_angularVelocity.Y); | ||
1786 | info.AddValue("m_angularVelocity.Z", m_angularVelocity.Z); | ||
1787 | |||
1788 | info.AddValue("m_acceleration.X", m_acceleration.X); | ||
1789 | info.AddValue("m_acceleration.Y", m_acceleration.Y); | ||
1790 | info.AddValue("m_acceleration.Z", m_acceleration.Z); | ||
1791 | |||
1792 | info.AddValue("m_description", m_description); | ||
1793 | info.AddValue("m_color", m_color); | ||
1794 | info.AddValue("m_text", m_text); | ||
1795 | info.AddValue("m_sitName", m_sitName); | ||
1796 | info.AddValue("m_touchName", m_touchName); | ||
1797 | info.AddValue("m_clickAction", m_clickAction); | ||
1798 | info.AddValue("m_shape", m_shape); | ||
1799 | info.AddValue("m_parentGroup", m_parentGroup); | ||
1800 | info.AddValue("PayPrice", PayPrice); | ||
1801 | } | ||
1802 | |||
1803 | public void GetProperties(IClientAPI client) | 1680 | public void GetProperties(IClientAPI client) |
1804 | { | 1681 | { |
1805 | client.SendObjectPropertiesReply( | 1682 | client.SendObjectPropertiesReply( |