diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Framework/InventoryItemBase.cs | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Framework/InventoryItemBase.cs')
| -rw-r--r-- | OpenSim/Framework/InventoryItemBase.cs | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index 4307fe2..7150c82 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs | |||
| @@ -354,7 +354,22 @@ namespace OpenSim.Framework | |||
| 354 | } | 354 | } |
| 355 | } | 355 | } |
| 356 | protected int m_creationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 356 | protected int m_creationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
| 357 | 357 | ||
| 358 | public InventoryItemBase() | ||
| 359 | { | ||
| 360 | } | ||
| 361 | |||
| 362 | public InventoryItemBase(UUID id) | ||
| 363 | { | ||
| 364 | ID = id; | ||
| 365 | } | ||
| 366 | |||
| 367 | public InventoryItemBase(UUID id, UUID owner) | ||
| 368 | { | ||
| 369 | ID = id; | ||
| 370 | Owner = owner; | ||
| 371 | } | ||
| 372 | |||
| 358 | public object Clone() | 373 | public object Clone() |
| 359 | { | 374 | { |
| 360 | return MemberwiseClone(); | 375 | return MemberwiseClone(); |