From 5c8a93c4262f3197a02645aea6c2b7362fd6784e Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 26 May 2008 01:50:40 +0000
Subject: * Extract and boil down necessary texture UUIDs for an archive of the
scene prims * no user functionality yet
---
OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++++++
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 8 ++++++--
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 7 +++----
3 files changed, 17 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes')
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1bcd3fd..f4ec1a3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -197,6 +197,14 @@ namespace OpenSim.Region.Environment.Scenes
// set { m_innerScene.SceneObjects = value; }
// }
+ ///
+ /// The dictionary of all entities in this scene. The contents of this dictionary may be changed at any time.
+ /// If you wish to add or remove entities, please use the appropriate method for that entity rather than
+ /// editing this dictionary directly.
+ ///
+ /// If you want a list of entities where the list itself is guaranteed not to change, please use
+ /// GetEntities()
+ ///
public Dictionary Entities
{
get { return m_innerScene.Entities; }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2ad01f9..a85c8d3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -92,8 +92,6 @@ namespace OpenSim.Region.Environment.Scenes
public bool HasGroupChanged = false;
public float scriptScore = 0f;
-
-
private LLVector3 lastPhysGroupPos;
private LLQuaternion lastPhysGroupRot;
@@ -2054,6 +2052,12 @@ namespace OpenSim.Region.Environment.Scenes
}
}
+ ///
+ /// Get the parts of this scene object
+ ///
+ ///
+ /// A
+ ///
public SceneObjectPart[] GetParts()
{
int numParts = Children.Count;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c6b3059..4b174e3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -85,7 +85,6 @@ namespace OpenSim.Region.Environment.Scenes
[Serializable]
public partial class SceneObjectPart : IScriptHost, ISerializable
{
-
[XmlIgnore] public PhysicsActor PhysActor = null;
public LLUUID LastOwnerID;
@@ -103,7 +102,6 @@ namespace OpenSim.Region.Environment.Scenes
[XmlIgnore] private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None;
[XmlIgnore] public bool DIE_AT_EDGE = false;
-
[XmlIgnore] public bool m_IsAttachment = false;
[XmlIgnore] public uint m_attachmentPoint = (byte)0;
[XmlIgnore] public LLUUID m_attachedAvatar = LLUUID.Zero;
@@ -700,7 +698,6 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_shape; }
set
{
-
m_shape = value;
TriggerScriptChangedEvent(Changed.SHAPE);
}
@@ -1949,6 +1946,7 @@ namespace OpenSim.Region.Environment.Scenes
public void UpdateExtraParam(ushort type, bool inUse, byte[] data)
{
m_shape.ReadInUpdateExtraParam(type, inUse, data);
+
if (type == 0x30)
{
if (m_shape.SculptEntry && m_shape.SculptTexture != LLUUID.Zero)
@@ -1957,9 +1955,10 @@ namespace OpenSim.Region.Environment.Scenes
m_parentGroup.Scene.AssetCache.GetAsset(m_shape.SculptTexture, SculptTextureCallback, true);
}
}
+
ScheduleFullUpdate();
-
}
+
public void SculptTextureCallback(LLUUID textureID, AssetBase texture)
{
if (m_shape.SculptEntry)
--
cgit v1.1