aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Simulation/Scenes/Primitive.cs
diff options
context:
space:
mode:
authormingchen2007-06-27 16:39:11 +0000
committermingchen2007-06-27 16:39:11 +0000
commite41eedc9aeba3eb36cdba4fcdf1e57bea976cab4 (patch)
tree7c9dbb6c56ff04a12c10e551629d9f6f40af9cf8 /OpenSim/Region/Simulation/Scenes/Primitive.cs
parentSome work on restructuring the namespaces / project names. Note this doesn't ... (diff)
downloadopensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.zip
opensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.gz
opensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.bz2
opensim-SC_OLD-e41eedc9aeba3eb36cdba4fcdf1e57bea976cab4.tar.xz
*Some more restructuring/fixing -- should compile, but high chance I forgot to add/remove something
Diffstat (limited to 'OpenSim/Region/Simulation/Scenes/Primitive.cs')
-rw-r--r--OpenSim/Region/Simulation/Scenes/Primitive.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Simulation/Scenes/Primitive.cs
index e04c711..0f649b2 100644
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ b/OpenSim/Region/Simulation/Scenes/Primitive.cs
@@ -36,7 +36,7 @@ using OpenSim.Physics.Manager;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Inventory; 37using OpenSim.Framework.Inventory;
38 38
39namespace OpenSim.Region.Scenes 39namespace OpenSim.Region.Environment.Scenes
40{ 40{
41 public class Primitive : Entity 41 public class Primitive : Entity
42 { 42 {
@@ -174,9 +174,9 @@ namespace OpenSim.Region.Scenes
174 dataArrays.Add(primData.ToBytes()); 174 dataArrays.Add(primData.ToBytes());
175 foreach (Entity child in children) 175 foreach (Entity child in children)
176 { 176 {
177 if (child is OpenSim.Region.Scenes.Primitive) 177 if (child is OpenSim.Region.Environment.Scenes.Primitive)
178 { 178 {
179 dataArrays.Add(((OpenSim.Region.Scenes.Primitive)child).GetByteArray()); 179 dataArrays.Add(((OpenSim.Region.Environment.Scenes.Primitive)child).GetByteArray());
180 } 180 }
181 } 181 }
182 byte[] primstart = Helpers.StringToField("<Prim>"); 182 byte[] primstart = Helpers.StringToField("<Prim>");