aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorUbitUmarov2016-01-01 23:41:25 +0000
committerUbitUmarov2016-01-01 23:41:25 +0000
commitee15c51ba475c4e56c26c60785a9e90fcd199766 (patch)
treefda00a947f62c04414dadaab46e34ea49521f0b0 /OpenSim/Region/OptionalModules
parent stop avatar move to target on parcel ban enforce (diff)
downloadopensim-SC-ee15c51ba475c4e56c26c60785a9e90fcd199766.zip
opensim-SC-ee15c51ba475c4e56c26c60785a9e90fcd199766.tar.gz
opensim-SC-ee15c51ba475c4e56c26c60785a9e90fcd199766.tar.bz2
opensim-SC-ee15c51ba475c4e56c26c60785a9e90fcd199766.tar.xz
add npc create option OS_NPC_OBJECT_GROUP. with it the npc will be created with the group of the object with the script, if that object owner is member of that group. This should allow parcel access by group to work now, and not much else. The groupTitle will also be set, it the region option NoNPCGroup is not active.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 7228348..d966fe5 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
64 private UUID m_uuid = UUID.Random(); 64 private UUID m_uuid = UUID.Random();
65 private readonly Scene m_scene; 65 private readonly Scene m_scene;
66 private readonly UUID m_ownerID; 66 private readonly UUID m_ownerID;
67 private UUID m_hostGroupID;
67 68
68 public List<uint> SelectedObjects {get; private set;} 69 public List<uint> SelectedObjects {get; private set;}
69 70
@@ -77,6 +78,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
77 m_scene = scene; 78 m_scene = scene;
78 m_ownerID = ownerID; 79 m_ownerID = ownerID;
79 SenseAsAgent = senseAsAgent; 80 SenseAsAgent = senseAsAgent;
81 m_hostGroupID = UUID.Zero;
80 } 82 }
81 83
82 public NPCAvatar( 84 public NPCAvatar(
@@ -89,6 +91,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
89 m_scene = scene; 91 m_scene = scene;
90 m_ownerID = ownerID; 92 m_ownerID = ownerID;
91 SenseAsAgent = senseAsAgent; 93 SenseAsAgent = senseAsAgent;
94 m_hostGroupID = UUID.Zero;
92 } 95 }
93 96
94 public IScene Scene 97 public IScene Scene
@@ -576,7 +579,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
576 } 579 }
577 public UUID ActiveGroupId 580 public UUID ActiveGroupId
578 { 581 {
579 get { return UUID.Zero; } 582 get { return m_hostGroupID; }
583 set { m_hostGroupID = value; }
580 } 584 }
581 585
582 public string ActiveGroupName 586 public string ActiveGroupName
@@ -591,7 +595,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
591 595
592 public bool IsGroupMember(UUID groupID) 596 public bool IsGroupMember(UUID groupID)
593 { 597 {
594 return false; 598 return (m_hostGroupID == groupID);
595 } 599 }
596 600
597 public ulong GetGroupPowers(UUID groupID) 601 public ulong GetGroupPowers(UUID groupID)