aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2009-04-09 13:14:25 +0000
committerAdam Frisby2009-04-09 13:14:25 +0000
commitc91c24441bb114502f0d49d026cfce0b47045c40 (patch)
tree1ad66d1b4876603dd650aea9f0840d9ca0bb464b /OpenSim
parent* World.OnChat no longer fires if there is no chat text (prevents the typing ... (diff)
downloadopensim-SC-c91c24441bb114502f0d49d026cfce0b47045c40.zip
opensim-SC-c91c24441bb114502f0d49d026cfce0b47045c40.tar.gz
opensim-SC-c91c24441bb114502f0d49d026cfce0b47045c40.tar.bz2
opensim-SC-c91c24441bb114502f0d49d026cfce0b47045c40.tar.xz
* Limits MRM scripting to Region Master Avatar only.
* This makes MRM scripting ever so slightly more secure. If you have enforced Object Permissions enabled, it may be acceptable to enable MRM within your regions. * Security bug reports on this feature are much appreciated (eg: anyone finding ways around this to execute a MRM as a basic user).
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 71077f2..910ddea 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -73,8 +73,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
73 73
74 void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) 74 void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)
75 { 75 {
76 if (script.StartsWith("//MiniMod:C#")) 76 if (script.StartsWith("//MRM:C#"))
77 { 77 {
78 if(m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
79 return;
80
78 try 81 try
79 { 82 {
80 m_log.Info("[MRM] Found C# MRM"); 83 m_log.Info("[MRM] Found C# MRM");