Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2016-12-04 23:39:15 +00:00
21 changed files with 235 additions and 167 deletions

View File

@@ -59,6 +59,7 @@ namespace OpenSim.Framework
private int _invType = 0;
private UUID _itemID = UUID.Zero;
private UUID _lastOwnerID = UUID.Zero;
private UUID _rezzerID = UUID.Zero;
private string _name = String.Empty;
private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL;
private UUID _ownerID = UUID.Zero;
@@ -254,6 +255,16 @@ namespace OpenSim.Framework
}
}
public UUID RezzerID
{
get {
return _rezzerID;
}
set {
_rezzerID = value;
}
}
public string Name {
get {
return _name;