aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMW2007-08-21 16:25:57 +0000
committerMW2007-08-21 16:25:57 +0000
commitb7134c834c9e44802debc10671acbece1e94aa95 (patch)
treef3989ef8f89c70f39a40961c94651b9d446e54f3 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parentCan now turn on/off server side permission checking (on prim editing etc) fro... (diff)
downloadopensim-SC_OLD-b7134c834c9e44802debc10671acbece1e94aa95.zip
opensim-SC_OLD-b7134c834c9e44802debc10671acbece1e94aa95.tar.gz
opensim-SC_OLD-b7134c834c9e44802debc10671acbece1e94aa95.tar.bz2
opensim-SC_OLD-b7134c834c9e44802debc10671acbece1e94aa95.tar.xz
Shift and Drag copying should now work correctly. [This was one of those stupid little one line bugs that was so much fun to track down that I decided to spend a few hours on it)
Linking groups should now work better than it did, but still a bit of work to do on getting the rotations of all the parts after linking right. Added part of dalien's #301 patch (xml loading/saving related parts with some small changes)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 8cf55ad..de3ad38 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
64 set { m_name = value; } 64 set { m_name = value; }
65 } 65 }
66 66
67 protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 +4 +8 + 268435456 + 128; 67 protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 268435456 + 128;
68 public uint ObjectFlags 68 public uint ObjectFlags
69 { 69 {
70 get { return (uint)m_flags; } 70 get { return (uint)m_flags; }
@@ -405,7 +405,7 @@ namespace OpenSim.Region.Environment.Scenes
405 { 405 {
406 if (localID == this.m_localID) 406 if (localID == this.m_localID)
407 { 407 {
408 //client.SendTaskInventory(this.m_uuid, 1, Helpers.StringToField("primInventory2")); 408 //client.SendTaskInventory(this.m_uuid, 1, Helpers.StringToField("primInventory2"));
409 client.SendTaskInventory(this.m_uuid, 0, new byte[0]); 409 client.SendTaskInventory(this.m_uuid, 0, new byte[0]);
410 } 410 }
411 } 411 }
@@ -421,7 +421,7 @@ namespace OpenSim.Region.Environment.Scenes
421 InventoryStringBuilder invString = new InventoryStringBuilder(); 421 InventoryStringBuilder invString = new InventoryStringBuilder();
422 invString.AddItemStart(); 422 invString.AddItemStart();
423 invString.AddNameValueLine("item_id", LLUUID.Random().ToStringHyphenated()); 423 invString.AddNameValueLine("item_id", LLUUID.Random().ToStringHyphenated());
424 invString.AddNameValueLine("parent_id",LLUUID.Zero.ToStringHyphenated()); 424 invString.AddNameValueLine("parent_id", LLUUID.Zero.ToStringHyphenated());
425 425
426 invString.AddPermissionsStart(); 426 invString.AddPermissionsStart();
427 invString.AddNameValueLine("base_mask", "0x7FFFFFFF"); 427 invString.AddNameValueLine("base_mask", "0x7FFFFFFF");
@@ -437,7 +437,7 @@ namespace OpenSim.Region.Environment.Scenes
437 437
438 invString.AddNameValueLine("asset_id", "00000000-0000-2222-3333-000000000001"); 438 invString.AddNameValueLine("asset_id", "00000000-0000-2222-3333-000000000001");
439 invString.AddNameValueLine("type", "lsltext"); 439 invString.AddNameValueLine("type", "lsltext");
440 invString.AddNameValueLine("inv_type" , "lsltext"); 440 invString.AddNameValueLine("inv_type", "lsltext");
441 invString.AddNameValueLine("flags", "0x00"); 441 invString.AddNameValueLine("flags", "0x00");
442 invString.AddNameValueLine("name", "Test inventory" + "|"); 442 invString.AddNameValueLine("name", "Test inventory" + "|");
443 invString.AddNameValueLine("desc", "test description" + "|"); 443 invString.AddNameValueLine("desc", "test description" + "|");
@@ -447,7 +447,7 @@ namespace OpenSim.Region.Environment.Scenes
447 byte[] fileInv = Helpers.StringToField(invString.BuildString); 447 byte[] fileInv = Helpers.StringToField(invString.BuildString);
448 byte[] data = new byte[fileInv.Length + 4]; 448 byte[] data = new byte[fileInv.Length + 4];
449 Array.Copy(Helpers.IntToBytes(fileInv.Length), 0, data, 0, 4); 449 Array.Copy(Helpers.IntToBytes(fileInv.Length), 0, data, 0, 4);
450 Array.Copy(fileInv, 0,data , 4, fileInv.Length); 450 Array.Copy(fileInv, 0, data, 4, fileInv.Length);
451 client.SendXferPacket(xferID, 0 + 0x80000000, data); 451 client.SendXferPacket(xferID, 0 + 0x80000000, data);
452 } 452 }
453 #endregion 453 #endregion