OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated to include saving of object flags. 

People will need to blow away their databases after this point.
afrisby
Sean Dague 2007-08-25 13:06:09 +00:00
parent 6555ffb591
commit c35e3b1f35
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
set { m_name = value; } set { m_name = value; }
} }
protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 268435456 + 128 + (uint)LLObject.ObjectFlags.Physics; protected LLObject.ObjectFlags m_flags;
public uint ObjectFlags public uint ObjectFlags
{ {
get { return (uint)m_flags; } get { return (uint)m_flags; }
@ -239,18 +239,23 @@ namespace OpenSim.Region.Environment.Scenes
this.Velocity = new LLVector3(0, 0, 0); this.Velocity = new LLVector3(0, 0, 0);
this.AngularVelocity = new LLVector3(0, 0, 0); this.AngularVelocity = new LLVector3(0, 0, 0);
this.Acceleration = new LLVector3(0, 0, 0); this.Acceleration = new LLVector3(0, 0, 0);
m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString(); m_inventoryFileName = "taskinventory" + LLUUID.Random().ToString();
m_folderID = LLUUID.Random(); m_folderID = LLUUID.Random();
//temporary code just so the m_flags field doesn't give a compiler warning m_flags = 0;
if (m_flags == LLObject.ObjectFlags.AllowInventoryDrop) m_flags |= LLObject.ObjectFlags.ObjectModify |
{ LLObject.ObjectFlags.ObjectCopy |
LLObject.ObjectFlags.ObjectYouOwner |
} LLObject.ObjectFlags.Touch |
LLObject.ObjectFlags.ObjectMove |
LLObject.ObjectFlags.AllowInventoryDrop |
LLObject.ObjectFlags.ObjectTransfer |
LLObject.ObjectFlags.ObjectOwnerModify;
ScheduleFullUpdate(); ScheduleFullUpdate();
} }
/// <summary> /// <summary>
/// Re/create a SceneObjectPart (prim) /// Re/create a SceneObjectPart (prim)
/// currently not used, and maybe won't be /// currently not used, and maybe won't be

3
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -275,6 +275,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
createCol(prims, "SitName", typeof(System.String)); createCol(prims, "SitName", typeof(System.String));
createCol(prims, "TouchName", typeof(System.String)); createCol(prims, "TouchName", typeof(System.String));
// permissions // permissions
createCol(prims, "ObjectFlags", typeof(System.Int32));
createCol(prims, "CreatorID", typeof(System.String)); createCol(prims, "CreatorID", typeof(System.String));
createCol(prims, "OwnerID", typeof(System.String)); createCol(prims, "OwnerID", typeof(System.String));
createCol(prims, "GroupID", typeof(System.String)); createCol(prims, "GroupID", typeof(System.String));
@ -379,6 +380,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
prim.SitName = (String)row["SitName"]; prim.SitName = (String)row["SitName"];
prim.TouchName = (String)row["TouchName"]; prim.TouchName = (String)row["TouchName"];
// permissions // permissions
prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
prim.CreatorID = new LLUUID((String)row["CreatorID"]); prim.CreatorID = new LLUUID((String)row["CreatorID"]);
prim.OwnerID = new LLUUID((String)row["OwnerID"]); prim.OwnerID = new LLUUID((String)row["OwnerID"]);
prim.GroupID = new LLUUID((String)row["GroupID"]); prim.GroupID = new LLUUID((String)row["GroupID"]);
@ -439,6 +441,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
row["SitName"] = prim.SitName; row["SitName"] = prim.SitName;
row["TouchName"] = prim.TouchName; row["TouchName"] = prim.TouchName;
// permissions // permissions
row["ObjectFlags"] = prim.ObjectFlags;
row["CreatorID"] = prim.CreatorID; row["CreatorID"] = prim.CreatorID;
row["OwnerID"] = prim.OwnerID; row["OwnerID"] = prim.OwnerID;
row["GroupID"] = prim.GroupID; row["GroupID"] = prim.GroupID;