aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2012-01-28 04:05:53 +0000
committerMelanie2012-01-28 04:05:53 +0000
commitabffda269f3bdedea7e5e339c120cd2b65b2a36c (patch)
treecb2537156fb9b4d91f5ce61987475f27e2e57f03 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentCompletely disable NPC being sensed as agents, the abuse potential is too great (diff)
parentAdd an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry t... (diff)
downloadopensim-SC_OLD-abffda269f3bdedea7e5e339c120cd2b65b2a36c.zip
opensim-SC_OLD-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.gz
opensim-SC_OLD-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.bz2
opensim-SC_OLD-abffda269f3bdedea7e5e339c120cd2b65b2a36c.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3b0d1cd..cf7bf16 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -538,6 +538,12 @@ namespace OpenSim.Region.Framework.Scenes
538 } 538 }
539 } 539 }
540 540
541 public UUID LastOwnerID
542 {
543 get { return m_rootPart.LastOwnerID; }
544 set { m_rootPart.LastOwnerID = value; }
545 }
546
541 public UUID OwnerID 547 public UUID OwnerID
542 { 548 {
543 get { return m_rootPart.OwnerID; } 549 get { return m_rootPart.OwnerID; }