diff options
| author | UbitUmarov | 2016-12-04 23:39:15 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-04 23:39:15 +0000 |
| commit | 1680425f4d3ddd1c59d99daee23180d985f24d86 (patch) | |
| tree | 56c22c5773ec4663840b1dee0002c9f8dc9d5133 /OpenSim/Framework | |
| parent | update httpserver (diff) | |
| parent | HG: fix the never ending avatar confirmation when 2 users from same grid made... (diff) | |
| download | opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.zip opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.gz opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.bz2 opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 2ec4bd1..b195bbe 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
| @@ -59,6 +59,7 @@ namespace OpenSim.Framework | |||
| 59 | private int _invType = 0; | 59 | private int _invType = 0; |
| 60 | private UUID _itemID = UUID.Zero; | 60 | private UUID _itemID = UUID.Zero; |
| 61 | private UUID _lastOwnerID = UUID.Zero; | 61 | private UUID _lastOwnerID = UUID.Zero; |
| 62 | private UUID _rezzerID = UUID.Zero; | ||
| 62 | private string _name = String.Empty; | 63 | private string _name = String.Empty; |
| 63 | private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL; | 64 | private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL; |
| 64 | private UUID _ownerID = UUID.Zero; | 65 | private UUID _ownerID = UUID.Zero; |
| @@ -254,6 +255,16 @@ namespace OpenSim.Framework | |||
| 254 | } | 255 | } |
| 255 | } | 256 | } |
| 256 | 257 | ||
| 258 | public UUID RezzerID | ||
| 259 | { | ||
| 260 | get { | ||
| 261 | return _rezzerID; | ||
| 262 | } | ||
| 263 | set { | ||
| 264 | _rezzerID = value; | ||
| 265 | } | ||
| 266 | } | ||
| 267 | |||
| 257 | public string Name { | 268 | public string Name { |
| 258 | get { | 269 | get { |
| 259 | return _name; | 270 | return _name; |