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

remove SOG.FromPartID from main code and flag it obsolete

melanie
UbitUmarov 2016-12-04 17:56:47 +00:00
parent 7c566dca5a
commit 51104be6d4
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2624,8 +2624,7 @@ namespace OpenSim.Region.Framework.Scenes
group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint; group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
} }
group.FromPartID = sourcePart.UUID; group.RezzerID = sourcePart.UUID;
group.RezzerID = group.FromPartID;
if( i == 0) if( i == 0)
AddNewSceneObject(group, true, curpos, rot, vel); AddNewSceneObject(group, true, curpos, rot, vel);

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

@ -1059,7 +1059,12 @@ 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 FromPartID { get; set; } /// obsolete use RezzerID
public UUID FromPartID
{
get { return RezzerID; }
set {RezzerID = value; }
}
/// <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/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
View File

@ -783,7 +783,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint; group.RootPart.Shape.LastAttachPoint = (byte)group.AttachmentPoint;
} }
group.FromPartID = host.RootPart.UUID; group.RezzerID = host.RootPart.UUID;
m_scene.AddNewSceneObject(group, true, curpos, rot, vel); m_scene.AddNewSceneObject(group, true, curpos, rot, vel);
UUID storeID = group.UUID; UUID storeID = group.UUID;

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

@ -4030,8 +4030,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject"); CheckThreatLevel(ThreatLevel.None, "osGetRezzingObject");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
UUID rezID = m_host.ParentGroup.RezzerID;
return new LSL_Key(m_host.ParentGroup.FromPartID.ToString()); if(rezID == UUID.Zero || m_host.ParentGroup.Scene.GetScenePresence(rezID) != null)
return new LSL_Key(UUID.Zero.ToString());
return new LSL_Key(rezID.ToString());
} }
/// <summary> /// <summary>