From 2fe9b8139cc74ff285759af3dcd48d38ec5bc561 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 15 Aug 2007 17:15:41 +0000 Subject: * Again, FileSystemObject reports filename. * SimpleApp now featuring spinning box with spinning parts. * Damn. That's cool. --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 ++++++ OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 1 + OpenSim/Region/Examples/SimpleApp/ComplexObject.cs | 2 ++ OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs | 15 ++++++++------- 4 files changed, 17 insertions(+), 7 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 2f4d707..7a1f117 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -858,5 +858,11 @@ namespace OpenSim.Region.Environment.Scenes } return null; } + + public void UpdateText( string text ) + { + m_rootPart.Text = text; + m_rootPart.ScheduleTerseUpdate(); + } } } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 81b2fe4..c4752a5 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -279,6 +279,7 @@ namespace OpenSim.Region.Environment.Scenes public void SetParent(SceneObjectGroup parent) { m_parentGroup = parent; + } #region Copying diff --git a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs index 25960b7..b21e4aa 100644 --- a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs @@ -41,6 +41,8 @@ namespace SimpleApp AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, 1f))); AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, -1f))); + + UpdateParentIDs(); } } } diff --git a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs index 920fea7..7cfdb46 100644 --- a/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs +++ b/OpenSim/Region/Examples/SimpleApp/FileSystemObject.cs @@ -7,20 +7,21 @@ using OpenSim.Framework.Types; using System.Timers; using System.Diagnostics; using System.IO; -using Primitive=OpenSim.Region.Environment.Scenes.Primitive; +using Primitive = OpenSim.Region.Environment.Scenes.Primitive; namespace SimpleApp { public class FileSystemObject : SceneObjectGroup { public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) - : base( world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default ) + : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default) { - - - float size = (float)Math.Pow((double)fileInfo.Length, (double) 1 / 3) / 5; - // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); - // rootPrimitive.Text = fileInfo.Name; + + + float size = (float)Math.Pow((double)fileInfo.Length, (double)1 / 3) / 5; + // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); + Text = fileInfo.Name; + ScheduleGroupForFullUpdate(); } public override void Update() -- cgit v1.1