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

Bannination fixes. Objects in nonpublic parcels were muted by default. Gods 

were muted, too.
avinationmerge
Melanie Thielker 2010-07-30 15:03:03 +02:00
parent 7a9e246ccd
commit f9280374d2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
View File

@ -244,7 +244,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y); ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
if (Presencecheck != null) if (Presencecheck != null)
{ {
if (Presencecheck.IsEitherBannedOrRestricted(c.SenderUUID) != true) // This will pass all chat from objects. Not
// perfect, but it will do. For now. Better
// than the prior behavior of muting all
// objects on a parcel with access restrictions
if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
{ {
TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix+fromName, c.Type, message, sourceType); TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix+fromName, c.Type, message, sourceType);
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6075,7 +6075,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return m_host.ParentGroup.RootPart.AttachmentPoint; return m_host.ParentGroup.RootPart.AttachmentPoint;
} }
public LSL_Integer llGetFreeMemory() public virtual LSL_Integer llGetFreeMemory()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// Make scripts designed for LSO happy // Make scripts designed for LSO happy