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

refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.

0.7.4.1
Justin Clark-Casey (justincc) 2012-08-03 02:26:54 +01:00
parent 08ec18f8a3
commit 513b77b78d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -2132,7 +2132,7 @@ namespace OpenSim.Region.Framework.Scenes
sourcePart.Inventory.RemoveInventoryItem(item.ItemID); sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
} }
group.RezzingObjectID = sourcePart.UUID; group.FromPartID = sourcePart.UUID;
AddNewSceneObject(group, true, pos, rot, vel); AddNewSceneObject(group, true, pos, rot, vel);
// We can only call this after adding the scene object, since the scene object references the scene // We can only call this after adding the scene object, since the scene object references the scene

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -617,7 +617,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <remarks> /// <remarks>
/// If not applicable will be UUID.Zero /// If not applicable will be UUID.Zero
/// </remarks> /// </remarks>
public UUID RezzingObjectID { get; set; } public UUID FromPartID { get; set; }
/// <summary> /// <summary>
/// The folder ID that this object was rezzed from, if applicable. /// The folder ID that this object was rezzed from, if applicable.

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -3320,7 +3320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject"); CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return new LSL_Key(m_host.ParentGroup.RezzingObjectID.ToString()); return new LSL_Key(m_host.ParentGroup.FromPartID.ToString());
} }
} }
} }