OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Completely disable NPC being sensed as agents, the abuse potential is too great

avinationmerge
Melanie 2012-01-28 03:12:56 +01:00
parent 428407c5e4
commit 090164ff7a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
View File

@ -173,6 +173,11 @@ namespace OpenSim.Data.MySQL
int v = Convert.ToInt32(reader[name]); int v = Convert.ToInt32(reader[name]);
m_Fields[name].SetValue(row, v); m_Fields[name].SetValue(row, v);
} }
else if (m_Fields[name].FieldType == typeof(uint))
{
uint v = Convert.ToUInt32(reader[name]);
m_Fields[name].SetValue(row, v);
}
else else
{ {
m_Fields[name].SetValue(row, reader[name]); m_Fields[name].SetValue(row, reader[name]);

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -2242,7 +2242,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
return NpcCreate(firstname, lastname, position, notecard, false, true); return NpcCreate(firstname, lastname, position, notecard, false, false);
} }
public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options)
@ -2252,8 +2252,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return NpcCreate( return NpcCreate(
firstname, lastname, position, notecard, firstname, lastname, position, notecard,
(options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0, (options & ScriptBaseClass.OS_NPC_NOT_OWNED) == 0);
(options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) == 0); // (options & ScriptBaseClass.OS_NPC_SENSE_AS_AGENT) == 0);
} }
private LSL_Key NpcCreate( private LSL_Key NpcCreate(