aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObject.cs
diff options
context:
space:
mode:
authorMW2007-07-09 15:59:35 +0000
committerMW2007-07-09 15:59:35 +0000
commit93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c (patch)
tree1b37d82af9a545e32922fff52c33b046bb6accb4 /OpenSim/Region/Environment/Scenes/SceneObject.cs
parent* Begun work on Primitive Duplication. Not hooked up yet, but theoretically c... (diff)
downloadopensim-SC-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.zip
opensim-SC-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.tar.gz
opensim-SC-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.tar.bz2
opensim-SC-93f3ef7e0d1c7d8b9c578ffdf4e45d9c0d2dde6c.tar.xz
Done a little bit of renaming in primitive.cs and on a few events in IClientAPI.
Disabled CAPS asset uploading as it seems it now crashes the server.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObject.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 2b80d57..ecd2dee 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -216,8 +216,6 @@ namespace OpenSim.Region.Environment.Scenes
216 /// <param name="client"></param> 216 /// <param name="client"></param>
217 public void GetProperites(IClientAPI client) 217 public void GetProperites(IClientAPI client)
218 { 218 {
219
220 //needs changing
221 ObjectPropertiesPacket proper = new ObjectPropertiesPacket(); 219 ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
222 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1]; 220 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
223 proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock(); 221 proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
@@ -242,9 +240,7 @@ namespace OpenSim.Region.Environment.Scenes
242 proper.ObjectData[0].EveryoneMask = this.rootPrimitive.EveryoneMask; 240 proper.ObjectData[0].EveryoneMask = this.rootPrimitive.EveryoneMask;
243 proper.ObjectData[0].BaseMask = this.rootPrimitive.BaseMask; 241 proper.ObjectData[0].BaseMask = this.rootPrimitive.BaseMask;
244 242
245 client.OutPacket(proper); 243 client.OutPacket(proper);
246
247 } 244 }
248
249 } 245 }
250} 246}