aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.World
diff options
context:
space:
mode:
authorMW2007-06-10 12:18:22 +0000
committerMW2007-06-10 12:18:22 +0000
commit1b1226a48370fc3f91ce2253bca848f6b698d40e (patch)
tree48c8bc9c8d987d302d38b1f42c604e47cb33dd14 /OpenSim/OpenSim.World
parent(no commit message) (diff)
downloadopensim-SC_OLD-1b1226a48370fc3f91ce2253bca848f6b698d40e.zip
opensim-SC_OLD-1b1226a48370fc3f91ce2253bca848f6b698d40e.tar.gz
opensim-SC_OLD-1b1226a48370fc3f91ce2253bca848f6b698d40e.tar.bz2
opensim-SC_OLD-1b1226a48370fc3f91ce2253bca848f6b698d40e.tar.xz
Started to rename "OpenSim.World" to "OpenSim.Region" for lbsa71 as we aim to please!
Diffstat (limited to 'OpenSim/OpenSim.World')
-rw-r--r--OpenSim/OpenSim.World/Avatar.Client.cs2
-rw-r--r--OpenSim/OpenSim.World/Avatar.Update.cs2
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs2
-rw-r--r--OpenSim/OpenSim.World/AvatarAnimations.cs4
-rw-r--r--OpenSim/OpenSim.World/Entity.cs4
-rw-r--r--OpenSim/OpenSim.World/Estate/EstateManager.cs4
-rw-r--r--OpenSim/OpenSim.World/ParcelManager.cs6
-rw-r--r--OpenSim/OpenSim.World/Primitive.cs8
-rw-r--r--OpenSim/OpenSim.World/SceneObject.cs4
-rw-r--r--OpenSim/OpenSim.World/World.PacketHandlers.cs2
-rw-r--r--OpenSim/OpenSim.World/World.Scripting.cs2
-rw-r--r--OpenSim/OpenSim.World/World.cs6
-rw-r--r--OpenSim/OpenSim.World/WorldBase.cs2
-rw-r--r--OpenSim/OpenSim.World/scripting/IScriptHandler.cs6
-rw-r--r--OpenSim/OpenSim.World/types/Mesh.cs2
-rw-r--r--OpenSim/OpenSim.World/types/Triangle.cs2
16 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/OpenSim.World/Avatar.Client.cs b/OpenSim/OpenSim.World/Avatar.Client.cs
index 2338f27..c180b36 100644
--- a/OpenSim/OpenSim.World/Avatar.Client.cs
+++ b/OpenSim/OpenSim.World/Avatar.Client.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife.Packets; 4using libsecondlife.Packets;
5 5
6namespace OpenSim.world 6namespace OpenSim.Region
7{ 7{
8 partial class Avatar 8 partial class Avatar
9 { 9 {
diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index c0d120a..2c28807 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -6,7 +6,7 @@ using libsecondlife.Packets;
6using OpenSim.Physics.Manager; 6using OpenSim.Physics.Manager;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8 8
9namespace OpenSim.world 9namespace OpenSim.Region
10{ 10{
11 partial class Avatar 11 partial class Avatar
12 { 12 {
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index 77e0300..88a7969 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -10,7 +10,7 @@ using OpenSim.Framework.Interfaces;
10using OpenSim.Framework.Types; 10using OpenSim.Framework.Types;
11using Axiom.MathLib; 11using Axiom.MathLib;
12 12
13namespace OpenSim.world 13namespace OpenSim.Region
14{ 14{
15 public partial class Avatar : Entity 15 public partial class Avatar : Entity
16 { 16 {
diff --git a/OpenSim/OpenSim.World/AvatarAnimations.cs b/OpenSim/OpenSim.World/AvatarAnimations.cs
index f13646d..585cf3c 100644
--- a/OpenSim/OpenSim.World/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.World/AvatarAnimations.cs
@@ -31,7 +31,7 @@ using System.Text;
31using libsecondlife; 31using libsecondlife;
32using System.Xml; 32using System.Xml;
33 33
34namespace OpenSim 34namespace OpenSim.Region
35{ 35{
36 public class AvatarAnimations 36 public class AvatarAnimations
37 { 37 {
@@ -64,7 +64,7 @@ namespace OpenSim
64 64
65 // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 65 // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
66 66
67 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID) 67 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
68 { 68 {
69 AnimsNames.Add(kp.Value, kp.Key); 69 AnimsNames.Add(kp.Value, kp.Key);
70 } 70 }
diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs
index dd5f9a6..60bcd83 100644
--- a/OpenSim/OpenSim.World/Entity.cs
+++ b/OpenSim/OpenSim.World/Entity.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using Axiom.MathLib; 4using Axiom.MathLib;
5using OpenSim.Physics.Manager; 5using OpenSim.Physics.Manager;
6using OpenSim.types; 6using OpenSim.Region.types;
7using libsecondlife; 7using libsecondlife;
8using OpenSim.RegionServer.world.scripting; 8using OpenSim.RegionServer.world.scripting;
9 9
10namespace OpenSim.world 10namespace OpenSim.Region
11{ 11{
12 public abstract class Entity : IScriptReadonlyEntity 12 public abstract class Entity : IScriptReadonlyEntity
13 { 13 {
diff --git a/OpenSim/OpenSim.World/Estate/EstateManager.cs b/OpenSim/OpenSim.World/Estate/EstateManager.cs
index c94587a..f136d44 100644
--- a/OpenSim/OpenSim.World/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.World/Estate/EstateManager.cs
@@ -4,13 +4,13 @@ using System.Text;
4 4
5using OpenSim.Framework.Types; 5using OpenSim.Framework.Types;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.world; 7using OpenSim.Region;
8using OpenSim; 8using OpenSim;
9 9
10using libsecondlife; 10using libsecondlife;
11using libsecondlife.Packets; 11using libsecondlife.Packets;
12 12
13namespace OpenSim.world.Estate 13namespace OpenSim.Region.Estate
14{ 14{
15 15
16 /// <summary> 16 /// <summary>
diff --git a/OpenSim/OpenSim.World/ParcelManager.cs b/OpenSim/OpenSim.World/ParcelManager.cs
index db6909d..37dd24f 100644
--- a/OpenSim/OpenSim.World/ParcelManager.cs
+++ b/OpenSim/OpenSim.World/ParcelManager.cs
@@ -33,7 +33,7 @@ using libsecondlife.Packets;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35 35
36namespace OpenSim.world 36namespace OpenSim.Region
37{ 37{
38 38
39 39
@@ -418,7 +418,7 @@ namespace OpenSim.world
418 { 418 {
419 for (y = 0; y < inc_y; y++) 419 for (y = 0; y < inc_y; y++)
420 { 420 {
421 OpenSim.world.Parcel currentParcel = getParcel(start_x + x, start_y + y); 421 OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);
422 if (!temp.Contains(currentParcel)) 422 if (!temp.Contains(currentParcel))
423 { 423 {
424 currentParcel.forceUpdateParcelInfo(); 424 currentParcel.forceUpdateParcelInfo();
@@ -648,7 +648,7 @@ namespace OpenSim.world
648 sendParcelProperties(0, false, 0, avatars[i].ControllingClient); 648 sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
649 } 649 }
650 } 650 }
651 651
652 } 652 }
653 } 653 }
654 #endregion 654 #endregion
diff --git a/OpenSim/OpenSim.World/Primitive.cs b/OpenSim/OpenSim.World/Primitive.cs
index 492341a..1b1894b 100644
--- a/OpenSim/OpenSim.World/Primitive.cs
+++ b/OpenSim/OpenSim.World/Primitive.cs
@@ -1,7 +1,7 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.types; 4using OpenSim.Region.types;
5using libsecondlife; 5using libsecondlife;
6using libsecondlife.Packets; 6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
@@ -9,7 +9,7 @@ using OpenSim.Physics.Manager;
9using OpenSim.Framework.Types; 9using OpenSim.Framework.Types;
10using OpenSim.Framework.Inventory; 10using OpenSim.Framework.Inventory;
11 11
12namespace OpenSim.world 12namespace OpenSim.Region
13{ 13{
14 public class Primitive : Entity 14 public class Primitive : Entity
15 { 15 {
@@ -84,9 +84,9 @@ namespace OpenSim.world
84 dataArrays.Add(primData.ToBytes()); 84 dataArrays.Add(primData.ToBytes());
85 foreach (Entity child in children) 85 foreach (Entity child in children)
86 { 86 {
87 if (child is OpenSim.world.Primitive) 87 if (child is OpenSim.Region.Primitive)
88 { 88 {
89 dataArrays.Add(((OpenSim.world.Primitive)child).GetByteArray()); 89 dataArrays.Add(((OpenSim.Region.Primitive)child).GetByteArray());
90 } 90 }
91 } 91 }
92 byte[] primstart = Helpers.StringToField("<Prim>"); 92 byte[] primstart = Helpers.StringToField("<Prim>");
diff --git a/OpenSim/OpenSim.World/SceneObject.cs b/OpenSim/OpenSim.World/SceneObject.cs
index 9ed99ba..9ea631b 100644
--- a/OpenSim/OpenSim.World/SceneObject.cs
+++ b/OpenSim/OpenSim.World/SceneObject.cs
@@ -1,7 +1,7 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.types; 4using OpenSim.Region.types;
5using libsecondlife; 5using libsecondlife;
6using libsecondlife.Packets; 6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
@@ -9,7 +9,7 @@ using OpenSim.Physics.Manager;
9using OpenSim.Framework.Types; 9using OpenSim.Framework.Types;
10using OpenSim.Framework.Inventory; 10using OpenSim.Framework.Inventory;
11 11
12namespace OpenSim.world 12namespace OpenSim.Region
13{ 13{
14 public class SceneObject : Entity 14 public class SceneObject : Entity
15 { 15 {
diff --git a/OpenSim/OpenSim.World/World.PacketHandlers.cs b/OpenSim/OpenSim.World/World.PacketHandlers.cs
index dd340d7..c88e920 100644
--- a/OpenSim/OpenSim.World/World.PacketHandlers.cs
+++ b/OpenSim/OpenSim.World/World.PacketHandlers.cs
@@ -9,7 +9,7 @@ using OpenSim.Framework.Types;
9using OpenSim.Framework.Inventory; 9using OpenSim.Framework.Inventory;
10using OpenSim.Framework.Utilities; 10using OpenSim.Framework.Utilities;
11 11
12namespace OpenSim.world 12namespace OpenSim.Region
13{ 13{
14 public partial class World 14 public partial class World
15 { 15 {
diff --git a/OpenSim/OpenSim.World/World.Scripting.cs b/OpenSim/OpenSim.World/World.Scripting.cs
index 048a97f..49a0fce 100644
--- a/OpenSim/OpenSim.World/World.Scripting.cs
+++ b/OpenSim/OpenSim.World/World.Scripting.cs
@@ -8,7 +8,7 @@ using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types; 8using OpenSim.Framework.Types;
9using libsecondlife; 9using libsecondlife;
10 10
11namespace OpenSim.world 11namespace OpenSim.Region
12{ 12{
13 public partial class World 13 public partial class World
14 { 14 {
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index cc2b04e..6932782 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -15,10 +15,10 @@ using OpenSim.Framework;
15using OpenSim.RegionServer.world.scripting; 15using OpenSim.RegionServer.world.scripting;
16using OpenSim.Terrain; 16using OpenSim.Terrain;
17using OpenGrid.Framework.Communications; 17using OpenGrid.Framework.Communications;
18using OpenSim.world.Estate; 18using OpenSim.Region.Estate;
19 19
20 20
21namespace OpenSim.world 21namespace OpenSim.Region
22{ 22{
23 public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI 23 public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
24 { 24 {
@@ -218,7 +218,7 @@ namespace OpenSim.world
218 //Parcel backup routines 218 //Parcel backup routines
219 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count]; 219 ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
220 int i = 0; 220 int i = 0;
221 foreach (OpenSim.world.Parcel parcel in parcelManager.parcelList.Values) 221 foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
222 { 222 {
223 parcels[i] = parcel.parcelData; 223 parcels[i] = parcel.parcelData;
224 i++; 224 i++;
diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs
index 92bc6a3..9fa4453 100644
--- a/OpenSim/OpenSim.World/WorldBase.cs
+++ b/OpenSim/OpenSim.World/WorldBase.cs
@@ -13,7 +13,7 @@ using OpenSim.Framework.Inventory;
13using OpenSim.RegionServer.world.scripting; 13using OpenSim.RegionServer.world.scripting;
14using OpenSim.Terrain; 14using OpenSim.Terrain;
15 15
16namespace OpenSim.world 16namespace OpenSim.Region
17{ 17{
18 public abstract class WorldBase : IWorld 18 public abstract class WorldBase : IWorld
19 { 19 {
diff --git a/OpenSim/OpenSim.World/scripting/IScriptHandler.cs b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs
index efd67b1..06d92a6 100644
--- a/OpenSim/OpenSim.World/scripting/IScriptHandler.cs
+++ b/OpenSim/OpenSim.World/scripting/IScriptHandler.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Physics.Manager; 5using OpenSim.Physics.Manager;
6using OpenSim.world; 6using OpenSim.Region;
7using Avatar=OpenSim.world.Avatar; 7using Avatar=OpenSim.Region.Avatar;
8using Primitive = OpenSim.world.Primitive; 8using Primitive = OpenSim.Region.Primitive;
9 9
10namespace OpenSim.RegionServer.world.scripting 10namespace OpenSim.RegionServer.world.scripting
11{ 11{
diff --git a/OpenSim/OpenSim.World/types/Mesh.cs b/OpenSim/OpenSim.World/types/Mesh.cs
index ff0cc65..ccc55eb 100644
--- a/OpenSim/OpenSim.World/types/Mesh.cs
+++ b/OpenSim/OpenSim.World/types/Mesh.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4 4
5namespace OpenSim.types 5namespace OpenSim.Region.types
6{ 6{
7 // TODO: This will need some performance tuning no doubt. 7 // TODO: This will need some performance tuning no doubt.
8 public class Mesh 8 public class Mesh
diff --git a/OpenSim/OpenSim.World/types/Triangle.cs b/OpenSim/OpenSim.World/types/Triangle.cs
index 07c0a91..488cc21 100644
--- a/OpenSim/OpenSim.World/types/Triangle.cs
+++ b/OpenSim/OpenSim.World/types/Triangle.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using Axiom.MathLib; 4using Axiom.MathLib;
5 5
6namespace OpenSim.types 6namespace OpenSim.Region.types
7{ 7{
8 public class Triangle 8 public class Triangle
9 { 9 {