*Some more restructuring/fixing -- should compile, but high chance I forgot to add/remove something

2026-08-05 00:46:02 +08:00 · 2007-06-27 16:39:11 +00:00
parent 646bbbc84b
commit e41eedc9ae
74 changed files with 231 additions and 1331 deletions
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ b/OpenSim/Region/Simulation/Scenes/Entity.cs
@@ -31,9 +31,9 @@ using System.Text;
 using Axiom.MathLib;
 using OpenSim.Physics.Manager;
 using libsecondlife;
-using OpenSim.Region.Scripting;
+using OpenSim.Region.Environment.Scripting;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public abstract class Entity : IScriptReadonlyEntity
    {
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
@@ -7,7 +7,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public interface IScenePresenceBody
    {
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ b/OpenSim/Region/Simulation/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public class Primitive : Entity
    {
@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
            dataArrays.Add(primData.ToBytes());
            foreach (Entity child in children)
            {
-                if (child is OpenSim.Region.Scenes.Primitive)
+                if (child is OpenSim.Region.Environment.Scenes.Primitive)
                {
-                    dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray());
+                    dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
                }
            }
            byte[] primstart = Helpers.StringToField("<Prim>");
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
@@ -36,7 +36,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public partial class Scene
    {
@@ -218,7 +218,7 @@ namespace OpenSim.Region.Scenes
            {
                if (ent.LocalId == primLocalID)
                {
-                    ((OpenSim.Region.Scenes.Primitive)ent).GetProperites(remoteClient);
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).GetProperites(remoteClient);
                    break;
                }
            }
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Scenes
            {
                if (ent.LocalId == localID)
                {
-                    ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);
+                    ((OpenSim.Region.Environment.Scenes.Primitive)ent).UpdatePosition(pos);
                    break;
                }
            }
--- a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using libsecondlife;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public partial class Scene
    {
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ b/OpenSim/Region/Simulation/Scenes/Scene.cs
@@ -39,14 +39,14 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
 using OpenSim.Framework;
-using OpenSim.Region.Scripting;
+using OpenSim.Region.Environment.Scripting;
 using OpenSim.Terrain;
-using OpenGrid.Framework.Communications;
-using OpenSim.Caches;
-using OpenSim.Region;
-using OpenSim.Servers;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Caches;
+using OpenSim.Region.Environment;
+using OpenSim.Framework.Servers;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public delegate bool FilterAvatarList(ScenePresence avatar);

@@ -256,7 +256,7 @@ namespace OpenSim.Region.Scenes
                //Parcel backup routines
                ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
                int i = 0;
-                foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
+                foreach (OpenSim.Region.Environment.Parcel parcel in parcelManager.parcelList.Values)
                {
                    parcels[i] = parcel.parcelData;
                    i++;
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneBase.cs
@@ -37,11 +37,11 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
-using OpenSim.Region.Scripting;
+using OpenSim.Region.Environment.Scripting;
 using OpenSim.Terrain;
-using OpenSim.Caches;
+using OpenSim.Region.Caches;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public abstract class SceneBase :  IWorld 
    {
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    /// <summary>
    /// A class for triggering remote scene events.
--- a/OpenSim/Region/Simulation/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Simulation/Scenes/SceneObject.cs
@@ -35,7 +35,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public class SceneObject : Entity
    {
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
@@ -31,7 +31,7 @@ using System.Text;
 using libsecondlife;
 using System.Xml;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    partial class ScenePresence
    {
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Scenes

                // OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");

-                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.ScenePresence.Animations.AnimsLLUUID)
+                foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Environment.Scenes.ScenePresence.Animations.AnimsLLUUID)
                {
                    AnimsNames.Add(kp.Value, kp.Key);
                }
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
@@ -34,7 +34,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    partial class ScenePresence
    {
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using Axiom.MathLib;

-namespace OpenSim.Region.Scenes
+namespace OpenSim.Region.Environment.Scenes
 {
    public partial class ScenePresence : Entity
    {
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;

-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
    public interface IScriptContext
    {
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;

-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
    public interface IScriptReadonlyEntity
    {
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
@@ -30,12 +30,12 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using OpenSim.Physics.Manager;
-using OpenSim.Region;
-using OpenSim.Region.Scenes;
-using Avatar=OpenSim.Region.Scenes.ScenePresence;
-using Primitive = OpenSim.Region.Scenes.Primitive;
+using OpenSim.Region.Environment;
+using OpenSim.Region.Environment.Scenes;
+using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
+using Primitive = OpenSim.Region.Environment.Scenes.Primitive;

-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
    public delegate void ScriptEventHandler(IScriptContext context);

--- a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;

-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
    public class Script
    {
--- a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;

-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
    public delegate Script ScriptFactory();
 }
--- a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;

-namespace OpenSim.Region.Scripting
+namespace OpenSim.Region.Environment.Scripting
 {
    public class FollowRandomAvatar : Script
    {