Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts:
	bin/Regions/Regions.ini.example

1 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs b/OpenSim/Region/Framework/Interfaces/ISceneCommandsModule.cs
index 8b43d42..c5e678b 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISceneCommandsModule.cs
@@ -9,7 +9,7 @@
  *     * 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
+ *     * Neither the name of the OpenSim Project nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
  *
@@ -25,19 +25,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.ApplicationPlugins.Rest.Inventory
-{
-    /// <summary>
-    /// This interface represents the boundary between the general purpose
-    /// REST plugin handling, and the functionally specific handlers. The
-    /// handler knows only to initialize and terminate all such handlers 
-    /// that it finds. Implementing this interface identifies the class as
-    /// a REST handler implementation.
-    /// </summary>
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
 
-    internal interface IRest
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface ISceneCommandsModule
     {
-        void Initialize();
-        void Close();
+        /// <summary>
+        /// Sets the scene debug options.
+        /// </summary>
+        void SetSceneDebugOptions(Dictionary<string, string> options);
     }
-}
+}
\ No newline at end of file