aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2007-09-11 14:18:34 +0000
committerMW2007-09-11 14:18:34 +0000
commit04cf04600c01f2cb328847133430f777bc7f1a7c (patch)
tree2976b99f12f66f86d94a2f23bdc953a8494d8dda /OpenSim/Region/Environment
parentGet rid of extra green men in minimap on region crossings (they were (diff)
downloadopensim-SC_OLD-04cf04600c01f2cb328847133430f777bc7f1a7c.zip
opensim-SC_OLD-04cf04600c01f2cb328847133430f777bc7f1a7c.tar.gz
opensim-SC_OLD-04cf04600c01f2cb328847133430f777bc7f1a7c.tar.bz2
opensim-SC_OLD-04cf04600c01f2cb328847133430f777bc7f1a7c.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs24
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs20
3 files changed, 46 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 2122a4f..81c759d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -10,7 +10,7 @@ using libsecondlife.Packets;
10using OpenSim.Framework.Interfaces; 10using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Types; 11using OpenSim.Framework.Types;
12using OpenSim.Region.Environment.Scenes.Scripting; 12using OpenSim.Region.Environment.Scenes.Scripting;
13using OpenSim.Framework.Utilities; 13using OpenSim.Framework;
14using OpenSim.Region.Physics.Manager; 14using OpenSim.Region.Physics.Manager;
15using OpenSim.Region.Environment.Interfaces; 15using OpenSim.Region.Environment.Interfaces;
16 16
@@ -29,7 +29,6 @@ namespace OpenSim.Region.Environment.Scenes
29 29
30 protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); 30 protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>();
31 31
32 public LLUUID CreatorID;
33 public LLUUID OwnerID; 32 public LLUUID OwnerID;
34 public LLUUID GroupID; 33 public LLUUID GroupID;
35 public LLUUID LastOwnerID; 34 public LLUUID LastOwnerID;
@@ -56,6 +55,9 @@ namespace OpenSim.Region.Environment.Scenes
56 55
57 #region Properties 56 #region Properties
58 57
58 public LLUUID CreatorID;
59 public LLUUID ObjectCreator { get { return CreatorID; } }
60
59 /// <summary> 61 /// <summary>
60 /// Serial count for inventory file , used to tell if inventory has changed 62 /// Serial count for inventory file , used to tell if inventory has changed
61 /// no need for this to be part of Database backup 63 /// no need for this to be part of Database backup
@@ -210,6 +212,11 @@ namespace OpenSim.Region.Environment.Scenes
210 get { return OwnerID; } 212 get { return OwnerID; }
211 } 213 }
212 214
215 public SceneObjectGroup ParentGroup
216 {
217 get { return m_parentGroup; }
218 }
219
213 #region Constructors 220 #region Constructors
214 /// <summary> 221 /// <summary>
215 /// 222 ///
@@ -324,6 +331,15 @@ namespace OpenSim.Region.Environment.Scenes
324 331
325 } 332 }
326 333
334 public LLUUID GetRootPartUUID()
335 {
336 if (m_parentGroup != null)
337 {
338 return m_parentGroup.UUID;
339 }
340 return LLUUID.Zero;
341 }
342
327 #region Copying 343 #region Copying
328 /// <summary> 344 /// <summary>
329 /// 345 ///
@@ -615,12 +631,14 @@ namespace OpenSim.Region.Environment.Scenes
615 for (int i = 0; i < avatars.Count; i++) 631 for (int i = 0; i < avatars.Count; i++)
616 { 632 {
617 avatars[i].AddFullPart(this); 633 avatars[i].AddFullPart(this);
634 // avatars[i].QueuePartForUpdate(this);
618 } 635 }
619 } 636 }
620 637
621 public void AddFullUpdateToAvatar(ScenePresence presence) 638 public void AddFullUpdateToAvatar(ScenePresence presence)
622 { 639 {
623 presence.AddFullPart(this); 640 presence.AddFullPart(this);
641 //presence.QueuePartForUpdate(this);
624 } 642 }
625 643
626 /// <summary> 644 /// <summary>
@@ -677,12 +695,14 @@ namespace OpenSim.Region.Environment.Scenes
677 for (int i = 0; i < avatars.Count; i++) 695 for (int i = 0; i < avatars.Count; i++)
678 { 696 {
679 avatars[i].AddTersePart(this); 697 avatars[i].AddTersePart(this);
698 // avatars[i].QueuePartForUpdate(this);
680 } 699 }
681 } 700 }
682 701
683 public void AddTerseUpdateToAvatar(ScenePresence presence) 702 public void AddTerseUpdateToAvatar(ScenePresence presence)
684 { 703 {
685 presence.AddTersePart(this); 704 presence.AddTersePart(this);
705 // presence.QueuePartForUpdate(this);
686 } 706 }
687 707
688 /// <summary> 708 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index e7d0570..2f248ce 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -8,8 +8,12 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
8 public interface IScriptHost 8 public interface IScriptHost
9 { 9 {
10 string Name { get; set;} 10 string Name { get; set;}
11 string SitName{ get; set;}
12 string TouchName { get; set;}
13 string Description { get; set; }
11 LLUUID UUID { get; } 14 LLUUID UUID { get; }
12 LLUUID ObjectOwner { get;} 15 LLUUID ObjectOwner { get;}
16 LLUUID ObjectCreator { get; }
13 LLVector3 AbsolutePosition { get; } 17 LLVector3 AbsolutePosition { get; }
14 void SetText(string text, Axiom.Math.Vector3 color, double alpha); 18 void SetText(string text, Axiom.Math.Vector3 color, double alpha);
15 } 19 }
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index a50b142..5e3dcae 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -15,6 +15,24 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
15 set { } 15 set { }
16 } 16 }
17 17
18 public string SitName
19 {
20 get { return ""; }
21 set { }
22 }
23
24 public string TouchName
25 {
26 get { return ""; }
27 set { }
28 }
29
30 public string Description
31 {
32 get { return ""; }
33 set { }
34 }
35
18 public LLUUID UUID 36 public LLUUID UUID
19 { 37 {
20 get { return LLUUID.Zero; } 38 get { return LLUUID.Zero; }
@@ -23,6 +41,8 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
23 public LLUUID ObjectOwner 41 public LLUUID ObjectOwner
24 { get { return LLUUID.Zero; } } 42 { get { return LLUUID.Zero; } }
25 43
44 public LLUUID ObjectCreator { get { return LLUUID.Zero; } }
45
26 public LLVector3 AbsolutePosition 46 public LLVector3 AbsolutePosition
27 { 47 {
28 get { return m_pos; } 48 get { return m_pos; }