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

* Refactored SOP.FolderID weirdness by removing calls to empty setter. YEs, I do realize the setter has to be there for legacy reasons, but since the calls will never acually DO anyhting, I'm removing them. 

* So, SOP.FolderID is actually a cruft field that should be removed.
GenericGridServerConcept
lbsa71 2009-02-25 11:01:38 +00:00
parent 64c14d2475
commit 41c883ea47
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Data/MSSQL/MSSQLRegionData.cs
View File

@ -122,10 +122,7 @@ namespace OpenSim.Data.MSSQL
sceneObjectPart.Shape = PrimitiveBaseShape.Default;
else
sceneObjectPart.Shape = BuildShape(reader);
// A relic from when we we thought that prims contained folder objects. In
// reality, prim == folder
sceneObjectPart.FolderID = sceneObjectPart.UUID;
sceneObjectParts.Add(sceneObjectPart);
UUID groupID = new UUID((Guid)reader["SceneGroupID"]);

4
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

@ -441,10 +441,6 @@ namespace OpenSim.Data.MySQL
else
prim.Shape = BuildShape(reader);
prim.FolderID = prim.UUID; // A relic from when we
// we thought prims contained
// folder objects. In
// reality, prim == folder
prims.Add(prim);
UUID groupID = new UUID(reader["SceneGroupID"].ToString());

7
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -516,13 +516,6 @@ namespace OpenSim.Data.SQLite
}
prim.Inventory.RestoreInventoryItems(inventory);
// XXX A nasty little hack to recover the folder id for the prim (which is currently stored in
// every item). This data should really be stored in the prim table itself.
if (dbItemRows.Length > 0)
{
prim.FolderID = inventory[0].ParentID;
}
}
/// <summary>

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -375,13 +375,15 @@ namespace OpenSim.Region.Framework.Scenes
}
/// <summary>
/// A relic from when we we thought that prims contained folder objects. In
/// reality, prim == folder
/// Exposing this is not particularly good, but it's one of the least evils at the moment to see
/// folder id from prim inventory item data, since it's not (yet) actually stored with the prim.
/// </summary>
public UUID FolderID
{
get { return UUID; }
set { } // Don't allow assignment, or legacy prims wil b0rk
set { } // Don't allow assignment, or legacy prims wil b0rk - but we need the setter for legacy serialization.
}
/// <value>