mirror of
https://github.com/opensim/opensim.git
synced 2026-08-11 11:57:03 +08:00
Applied ldvoipeng's patch [#360], sorry for it taking so long to apply it. If in future anyone's patch hasn't been applied within a few days, please can someone kick one of the developers with svn access.
This commit is contained in:
@@ -10,7 +10,7 @@ using libsecondlife.Packets;
|
||||
using OpenSim.Framework.Interfaces;
|
||||
using OpenSim.Framework.Types;
|
||||
using OpenSim.Region.Environment.Scenes.Scripting;
|
||||
using OpenSim.Framework.Utilities;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Physics.Manager;
|
||||
using OpenSim.Region.Environment.Interfaces;
|
||||
|
||||
@@ -29,7 +29,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
|
||||
protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>();
|
||||
|
||||
public LLUUID CreatorID;
|
||||
public LLUUID OwnerID;
|
||||
public LLUUID GroupID;
|
||||
public LLUUID LastOwnerID;
|
||||
@@ -56,6 +55,9 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
|
||||
#region Properties
|
||||
|
||||
public LLUUID CreatorID;
|
||||
public LLUUID ObjectCreator { get { return CreatorID; } }
|
||||
|
||||
/// <summary>
|
||||
/// Serial count for inventory file , used to tell if inventory has changed
|
||||
/// no need for this to be part of Database backup
|
||||
@@ -210,6 +212,11 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
get { return OwnerID; }
|
||||
}
|
||||
|
||||
public SceneObjectGroup ParentGroup
|
||||
{
|
||||
get { return m_parentGroup; }
|
||||
}
|
||||
|
||||
#region Constructors
|
||||
/// <summary>
|
||||
///
|
||||
@@ -324,6 +331,15 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
|
||||
}
|
||||
|
||||
public LLUUID GetRootPartUUID()
|
||||
{
|
||||
if (m_parentGroup != null)
|
||||
{
|
||||
return m_parentGroup.UUID;
|
||||
}
|
||||
return LLUUID.Zero;
|
||||
}
|
||||
|
||||
#region Copying
|
||||
/// <summary>
|
||||
///
|
||||
@@ -615,12 +631,14 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
for (int i = 0; i < avatars.Count; i++)
|
||||
{
|
||||
avatars[i].AddFullPart(this);
|
||||
// avatars[i].QueuePartForUpdate(this);
|
||||
}
|
||||
}
|
||||
|
||||
public void AddFullUpdateToAvatar(ScenePresence presence)
|
||||
{
|
||||
presence.AddFullPart(this);
|
||||
//presence.QueuePartForUpdate(this);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -677,12 +695,14 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
for (int i = 0; i < avatars.Count; i++)
|
||||
{
|
||||
avatars[i].AddTersePart(this);
|
||||
// avatars[i].QueuePartForUpdate(this);
|
||||
}
|
||||
}
|
||||
|
||||
public void AddTerseUpdateToAvatar(ScenePresence presence)
|
||||
{
|
||||
presence.AddTersePart(this);
|
||||
// presence.QueuePartForUpdate(this);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -8,8 +8,12 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
|
||||
public interface IScriptHost
|
||||
{
|
||||
string Name { get; set;}
|
||||
string SitName{ get; set;}
|
||||
string TouchName { get; set;}
|
||||
string Description { get; set; }
|
||||
LLUUID UUID { get; }
|
||||
LLUUID ObjectOwner { get;}
|
||||
LLUUID ObjectCreator { get; }
|
||||
LLVector3 AbsolutePosition { get; }
|
||||
void SetText(string text, Axiom.Math.Vector3 color, double alpha);
|
||||
}
|
||||
|
||||
@@ -15,6 +15,24 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
|
||||
set { }
|
||||
}
|
||||
|
||||
public string SitName
|
||||
{
|
||||
get { return ""; }
|
||||
set { }
|
||||
}
|
||||
|
||||
public string TouchName
|
||||
{
|
||||
get { return ""; }
|
||||
set { }
|
||||
}
|
||||
|
||||
public string Description
|
||||
{
|
||||
get { return ""; }
|
||||
set { }
|
||||
}
|
||||
|
||||
public LLUUID UUID
|
||||
{
|
||||
get { return LLUUID.Zero; }
|
||||
@@ -23,6 +41,8 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
|
||||
public LLUUID ObjectOwner
|
||||
{ get { return LLUUID.Zero; } }
|
||||
|
||||
public LLUUID ObjectCreator { get { return LLUUID.Zero; } }
|
||||
|
||||
public LLVector3 AbsolutePosition
|
||||
{
|
||||
get { return m_pos; }
|
||||
|
||||
Reference in New Issue
Block a user