Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

3 files changed, 49 insertions, 18 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 9042e0d..bf523dd 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -211,25 +211,39 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         {
             if (script.StartsWith("//MRM:C#"))
             {
-                if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID
-                    ||
-                    m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
-                    return;
+                if (m_config.GetBoolean("OwnerOnly", true))
+                    if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID
+                        || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
+                        return;
 
                 script = ConvertMRMKeywords(script);
 
                 try
                 {
-                    m_log.Info("[MRM] Found C# MRM - Starting in AppDomain with " + m_config.GetString("permissionLevel", "Internet") + "-level security.");
+                    AppDomain target;
+                    if (m_config.GetBoolean("Sandboxed", true))
+                    {
+                        m_log.Info("[MRM] Found C# MRM - Starting in AppDomain with " +
+                                   m_config.GetString("SandboxLevel", "Internet") + "-level security.");
 
-                    string domainName = UUID.Random().ToString();
-                    AppDomain target = CreateRestrictedDomain(m_config.GetString("permissionLevel", "Internet"),
-                                                              domainName);
+                        string domainName = UUID.Random().ToString();
+                        target = CreateRestrictedDomain(m_config.GetString("SandboxLevel", "Internet"),
+                                                                  domainName);
+                    }
+                    else
+                    {
+                        m_log.Info("[MRM] Found C# MRM - Starting in current AppDomain");
+                        m_log.Warn(
+                            "[MRM] Security Risk: AppDomain is run in current context. Use only in trusted environments.");
+                        target = AppDomain.CurrentDomain;
+                    }
 
+                    m_log.Info("[MRM] Unwrapping into target AppDomain");
                     MRMBase mmb = (MRMBase) target.CreateInstanceFromAndUnwrap(
                                                 CompileFromDotNetText(script, itemID.ToString()),
                                                 "OpenSim.MiniModule");
 
+                    m_log.Info("[MRM] Initialising MRM Globals");
                     InitializeMRM(mmb, localID, itemID);
 
                     m_scripts[itemID] = mmb;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
index 68f2f52..0cba6af 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObjectMaterial.cs
@@ -91,24 +91,45 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public bool Bright
         {
             get { return GetTexface().Fullbright; }
-            set { throw new System.NotImplementedException(); }
+            set
+            {
+                Primitive.TextureEntry tex = m_parent.Shape.Textures;
+                Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
+                texface.Fullbright = value;
+                tex.FaceTextures[m_face] = texface;
+                m_parent.UpdateTexture(tex);
+            }
         }
 
         public double Bloom
         {
             get { return GetTexface().Glow; }
-            set { throw new System.NotImplementedException(); }
+            set
+            {
+                Primitive.TextureEntry tex = m_parent.Shape.Textures;
+                Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
+                texface.Glow = (float) value;
+                tex.FaceTextures[m_face] = texface;
+                m_parent.UpdateTexture(tex);
+            }
         }
 
         public bool Shiny
         {
             get { return GetTexface().Shiny != Shininess.None; }
-            set { throw new System.NotImplementedException(); }
+            set
+            {
+                Primitive.TextureEntry tex = m_parent.Shape.Textures;
+                Primitive.TextureEntryFace texface = tex.CreateFace((uint)m_face);
+                texface.Shiny = value ? Shininess.High : Shininess.None;
+                tex.FaceTextures[m_face] = texface;
+                m_parent.UpdateTexture(tex);
+            }
         }
 
         public bool BumpMap
         {
-            get { throw new System.NotImplementedException(); }
+            get { return GetTexface().Bump == Bumpiness.None; }
             set { throw new System.NotImplementedException(); }
         }
     }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
index 4600836..4427426 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs
@@ -25,17 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Reflection;
 using System.Collections;
 using System.Collections.Generic;
-
+using System.Security;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 
-using log4net;
-
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
     class SPAvatar : System.MarshalByRefObject, IAvatar
@@ -60,7 +56,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public string Name
         {
             get { return GetSP().Name; }
-            set { throw new InvalidOperationException("Avatar Names are a read-only property."); }
+            set { throw new SecurityException("Avatar Names are a read-only property."); }
         }
 
         public UUID GlobalID