* Adds IObject.Shape to MRM

* Implements Sculpty modification support to MRM
* Example: IObject.Shape.SculptMap = new UUID("0000-0000-0000....");

2 files changed, 16 insertions, 46 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
index dc2e3fa..ef1e896 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
@@ -157,7 +157,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         bool IsFlexible { get; set; }
 
-        PrimType PrimShape { get; set; }
+        IObjectShape Shape { get; }
+
         // TODO:
         // PrimHole
         // Repeats, Offsets, Cut/Dimple/ProfileCut
@@ -191,19 +192,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         Flesh
     }
 
-    public enum PrimType
-    {
-        NotPrimitive = 255,
-        Box = 0,
-        Cylinder = 1,
-        Prism = 2,
-        Sphere = 3,
-        Torus = 4,
-        Tube = 5,
-        Ring = 6,
-        Sculpt = 7
-    }
-
     public enum TextureMapping
     {
         Default,
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
index 46b5041..f850a94 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
@@ -1,31 +1,4 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
+using System;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
@@ -50,21 +23,30 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         /// Fire this scheduler only when the region has
         /// a user in it.
         /// </summary>
-        bool WhenRegionOccupied { get; set; }
+        bool IfOccupied { get; set; }
+
+        /// <summary>
+        /// Fire this only when simulator performance
+        /// is reasonable. (eg sysload <= 1.0)
+        /// </summary>
+        bool IfHealthy { get; set; }
 
         /// <summary>
         /// Fire this event only when the region is visible
         /// to a child agent, or there is a full agent
         /// in this region.
         /// </summary>
-        bool WhenRegionVisible { get; set; }
+        bool IfVisible { get; set; }
 
         /// <summary>
         /// Determines whether this runs in the master scheduler thread, or a new thread
         /// is spawned to handle your request. Running in scheduler may mean that your
-        /// code does not execute perfectly on time, however will result in a lower
-        /// processor cost to running your code.
+        /// code does not execute perfectly on time, however will result in better
+        /// region performance.
         /// </summary>
+        /// <remarks>
+        /// Default: true
+        /// </remarks>
         bool Schedule { get; set; }
     }
 }