From 513b77b78d8990b1f7edd0f91625f286286e131d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 3 Aug 2012 02:26:54 +0100
Subject: 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.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs                | 2 +-
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs               | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

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
                     sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
             }
 
-            group.RezzingObjectID = sourcePart.UUID;
+            group.FromPartID = sourcePart.UUID;
             AddNewSceneObject(group, true, pos, rot, vel);
             
             // 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
         /// <remarks>
         /// If not applicable will be UUID.Zero
         /// </remarks>
-        public UUID RezzingObjectID { get; set; }
+        public UUID FromPartID { get; set; }
 
         /// <summary>
         /// 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
             CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject");
             m_host.AddScriptLPS(1);
 
-            return new LSL_Key(m_host.ParentGroup.RezzingObjectID.ToString());
+            return new LSL_Key(m_host.ParentGroup.FromPartID.ToString());
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1