diff options
author | Justin Clark-Casey (justincc) | 2012-08-03 02:26:54 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-03 02:26:54 +0100 |
commit | 513b77b78d8990b1f7edd0f91625f286286e131d (patch) | |
tree | 982f0b51743c78e6eb22e124d58eaed695e92494 /OpenSim | |
parent | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this i... (diff) | |
download | opensim-SC-513b77b78d8990b1f7edd0f91625f286286e131d.zip opensim-SC-513b77b78d8990b1f7edd0f91625f286286e131d.tar.gz opensim-SC-513b77b78d8990b1f7edd0f91625f286286e131d.tar.bz2 opensim-SC-513b77b78d8990b1f7edd0f91625f286286e131d.tar.xz |
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.
Diffstat (limited to '')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a2016da..7e31d60 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2132,7 +2132,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2132 | sourcePart.Inventory.RemoveInventoryItem(item.ItemID); | 2132 | sourcePart.Inventory.RemoveInventoryItem(item.ItemID); |
2133 | } | 2133 | } |
2134 | 2134 | ||
2135 | group.RezzingObjectID = sourcePart.UUID; | 2135 | group.FromPartID = sourcePart.UUID; |
2136 | AddNewSceneObject(group, true, pos, rot, vel); | 2136 | AddNewSceneObject(group, true, pos, rot, vel); |
2137 | 2137 | ||
2138 | // We can only call this after adding the scene object, since the scene object references the scene | 2138 | // We can only call this after adding the scene object, since the scene object references the scene |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 890971d..7b284ae 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -617,7 +617,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
617 | /// <remarks> | 617 | /// <remarks> |
618 | /// If not applicable will be UUID.Zero | 618 | /// If not applicable will be UUID.Zero |
619 | /// </remarks> | 619 | /// </remarks> |
620 | public UUID RezzingObjectID { get; set; } | 620 | public UUID FromPartID { get; set; } |
621 | 621 | ||
622 | /// <summary> | 622 | /// <summary> |
623 | /// The folder ID that this object was rezzed from, if applicable. | 623 | /// The folder ID that this object was rezzed from, if applicable. |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index e5a4fe8..bcd1a6f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -3320,7 +3320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3320 | CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject"); | 3320 | CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject"); |
3321 | m_host.AddScriptLPS(1); | 3321 | m_host.AddScriptLPS(1); |
3322 | 3322 | ||
3323 | return new LSL_Key(m_host.ParentGroup.RezzingObjectID.ToString()); | 3323 | return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); |
3324 | } | 3324 | } |
3325 | } | 3325 | } |
3326 | } \ No newline at end of file | 3326 | } \ No newline at end of file |