diff options
author | lbsa71 | 2007-08-15 17:15:41 +0000 |
---|---|---|
committer | lbsa71 | 2007-08-15 17:15:41 +0000 |
commit | 2fe9b8139cc74ff285759af3dcd48d38ec5bc561 (patch) | |
tree | 755a798354b020ac8f504d644975e1969370d938 /OpenSim/Region | |
parent | * Exploring Group/Part from an app perspective. (diff) | |
download | opensim-SC-2fe9b8139cc74ff285759af3dcd48d38ec5bc561.zip opensim-SC-2fe9b8139cc74ff285759af3dcd48d38ec5bc561.tar.gz opensim-SC-2fe9b8139cc74ff285759af3dcd48d38ec5bc561.tar.bz2 opensim-SC-2fe9b8139cc74ff285759af3dcd48d38ec5bc561.tar.xz |
* Again, FileSystemObject reports filename.
* SimpleApp now featuring spinning box with spinning parts.
* Damn. That's cool.
Diffstat (limited to 'OpenSim/Region')
4 files changed, 17 insertions, 7 deletions
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 | |||
858 | } | 858 | } |
859 | return null; | 859 | return null; |
860 | } | 860 | } |
861 | |||
862 | public void UpdateText( string text ) | ||
863 | { | ||
864 | m_rootPart.Text = text; | ||
865 | m_rootPart.ScheduleTerseUpdate(); | ||
866 | } | ||
861 | } | 867 | } |
862 | } | 868 | } |
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 | |||
279 | public void SetParent(SceneObjectGroup parent) | 279 | public void SetParent(SceneObjectGroup parent) |
280 | { | 280 | { |
281 | m_parentGroup = parent; | 281 | m_parentGroup = parent; |
282 | |||
282 | } | 283 | } |
283 | 284 | ||
284 | #region Copying | 285 | #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 | |||
41 | 41 | ||
42 | AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, 1f))); | 42 | AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, 1f))); |
43 | AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, -1f))); | 43 | AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, -1f))); |
44 | |||
45 | UpdateParentIDs(); | ||
44 | } | 46 | } |
45 | } | 47 | } |
46 | } | 48 | } |
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; | |||
7 | using System.Timers; | 7 | using System.Timers; |
8 | using System.Diagnostics; | 8 | using System.Diagnostics; |
9 | using System.IO; | 9 | using System.IO; |
10 | using Primitive=OpenSim.Region.Environment.Scenes.Primitive; | 10 | using Primitive = OpenSim.Region.Environment.Scenes.Primitive; |
11 | 11 | ||
12 | namespace SimpleApp | 12 | namespace SimpleApp |
13 | { | 13 | { |
14 | public class FileSystemObject : SceneObjectGroup | 14 | public class FileSystemObject : SceneObjectGroup |
15 | { | 15 | { |
16 | public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) | 16 | public FileSystemObject(Scene world, FileInfo fileInfo, LLVector3 pos) |
17 | : base( world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default ) | 17 | : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, BoxShape.Default) |
18 | { | 18 | { |
19 | 19 | ||
20 | 20 | ||
21 | float size = (float)Math.Pow((double)fileInfo.Length, (double) 1 / 3) / 5; | 21 | float size = (float)Math.Pow((double)fileInfo.Length, (double)1 / 3) / 5; |
22 | // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); | 22 | // rootPrimitive.ResizeGoup(new LLVector3(size, size, size)); |
23 | // rootPrimitive.Text = fileInfo.Name; | 23 | Text = fileInfo.Name; |
24 | ScheduleGroupForFullUpdate(); | ||
24 | } | 25 | } |
25 | 26 | ||
26 | public override void Update() | 27 | public override void Update() |