aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-10-08 02:39:14 +0100
committerUbitUmarov2015-10-08 02:39:14 +0100
commit3a498b0637ed1396da1b5f427ed96a588e87f3d6 (patch)
tree4ac4619bf00839fb09a92b0690e4c2165d5d848e
parent dont send of the contents of LinkFolders also on Multiple folder fetch. Outf... (diff)
downloadopensim-SC_OLD-3a498b0637ed1396da1b5f427ed96a588e87f3d6.zip
opensim-SC_OLD-3a498b0637ed1396da1b5f427ed96a588e87f3d6.tar.gz
opensim-SC_OLD-3a498b0637ed1396da1b5f427ed96a588e87f3d6.tar.bz2
opensim-SC_OLD-3a498b0637ed1396da1b5f427ed96a588e87f3d6.tar.xz
change NPC restriction options default from restricted to all allowed, as master
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs14
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 97c15a9..d40fa48 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -67,22 +67,16 @@ namespace OpenSim.Region.OptionalModules.World.NPC
67 m_NPCOptionFlags = NPCOptionsFlags.None; 67 m_NPCOptionFlags = NPCOptionsFlags.None;
68 if(Enabled) 68 if(Enabled)
69 { 69 {
70 bool opt = false; 70 if(config.GetBoolean("AllowNotOwned", true))
71
72 opt = config.GetBoolean("AllowNotOwned", false);
73 if(opt)
74 m_NPCOptionFlags |= NPCOptionsFlags.AllowNotOwned; 71 m_NPCOptionFlags |= NPCOptionsFlags.AllowNotOwned;
75 72
76 opt = config.GetBoolean("AllowSenseAsAvatar", false); 73 if(config.GetBoolean("AllowSenseAsAvatar", true))
77 if(opt)
78 m_NPCOptionFlags |= NPCOptionsFlags.AllowSenseAsAvatar; 74 m_NPCOptionFlags |= NPCOptionsFlags.AllowSenseAsAvatar;
79 75
80 opt = config.GetBoolean("AllowCloneOtherAvatars", false); 76 if(config.GetBoolean("AllowCloneOtherAvatars", true))
81 if(opt)
82 m_NPCOptionFlags |= NPCOptionsFlags.AllowCloneOtherAvatars; 77 m_NPCOptionFlags |= NPCOptionsFlags.AllowCloneOtherAvatars;
83 78
84 opt = config.GetBoolean("NoNPCGroup", false); 79 if(config.GetBoolean("NoNPCGroup", true))
85 if(opt)
86 m_NPCOptionFlags |= NPCOptionsFlags.NoNPCGroup; 80 m_NPCOptionFlags |= NPCOptionsFlags.NoNPCGroup;
87 } 81 }
88 } 82 }