Merge branch 'SledjChisl'

1 files changed, 20 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/INPCModule.cs b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
index 478833e..df872f4 100644
--- a/OpenSim/Region/Framework/Interfaces/INPCModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/INPCModule.cs
@@ -31,6 +31,17 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    // option flags for NPCs
+    public enum NPCOptionsFlags : int
+    {
+        None                    = 0x00, // no flags (max restriction)
+        AllowNotOwned           = 0x01, // allow NPCs to be created not Owned
+        AllowSenseAsAvatar      = 0x02, // allow NPCs to set to be sensed as Avatars
+        AllowCloneOtherAvatars  = 0x04, // allow NPCs to created cloning a avatar in region
+        NoNPCGroup              = 0x08, // NPCs will have no group title, otherwise will have "- NPC -"
+        objectGroup               = 0x10  // NPC will have host sog groupID
+    }
+
     /// <summary>
     /// Temporary interface. More methods to come at some point to make NPCs
     /// more object oriented rather than controlling purely through module
@@ -38,12 +49,18 @@ namespace OpenSim.Region.Framework.Interfaces
     /// </summary>
     public interface INPC
     {
+
         /// <summary>
         /// Should this NPC be sensed by LSL sensors as an 'agent'
         /// (interpreted here to mean a normal user) rather than an OpenSim
         /// specific NPC extension?
         /// </summary>
         bool SenseAsAgent { get; }
+        UUID ActiveGroupId { get; set; }
+        UUID Owner { get; }
+        string profileAbout { get; set; }
+        UUID profileImage { get; set; }
+        string Born { get; set; }
     }
 
     public interface INPCModule
@@ -94,7 +111,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// failure.
         /// </returns>
         UUID CreateNPC(string firstname, string lastname,
-                Vector3 position, UUID agentID, UUID owner, bool senseAsAgent, Scene scene,
+                Vector3 position, UUID agentID, UUID owner, string groupTitle, UUID groupID, bool senseAsAgent, Scene scene,
                 AvatarAppearance appearance);
 
         /// <summary>
@@ -284,5 +301,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// agent, the agent is unowned  or the agent was not an NPC.
         /// </returns>
         UUID GetOwner(UUID agentID);
+
+        NPCOptionsFlags NPCOptionFlags {get;}
     }
 }