Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-03 01:40:24 +01:00
25 changed files with 462 additions and 983 deletions

View File

@@ -122,6 +122,8 @@ namespace OpenSim.Framework
private int _type = 0;
private UUID _oldID;
private bool _ownerChanged = false;
public UUID AssetID {
get {
return _assetID;
@@ -320,6 +322,15 @@ namespace OpenSim.Framework
}
}
public bool OwnerChanged {
get {
return _ownerChanged;
}
set {
_ownerChanged = value;
}
}
// See ICloneable
#region ICloneable Members