aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2007-07-29 13:05:57 +0000
committerMW2007-07-29 13:05:57 +0000
commit5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7 (patch)
tree53cd656a91fd400f8bb46768ab070a96f88ae238 /OpenSim/Region/Environment
parent* Primitives no longer walk around while being rescaled. (diff)
downloadopensim-SC_OLD-5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7.zip
opensim-SC_OLD-5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7.tar.gz
opensim-SC_OLD-5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7.tar.bz2
opensim-SC_OLD-5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7.tar.xz
Deleting objects should now work. But beware they aren't send to your trash folder or anything so there is at the moment no way to recover deleted objects.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Primitive.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs38
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
4 files changed, 46 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index ba10893..60ea28f 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -33,9 +33,9 @@ namespace OpenSim.Region.Environment.Scenes
33 33
34 public uint OwnerMask = FULL_MASK_PERMISSIONS; 34 public uint OwnerMask = FULL_MASK_PERMISSIONS;
35 public uint NextOwnerMask = FULL_MASK_PERMISSIONS; 35 public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
36 public uint GroupMask = FULL_MASK_PERMISSIONS; 36 public uint GroupMask = 0;// FULL_MASK_PERMISSIONS;
37 public uint EveryoneMask = FULL_MASK_PERMISSIONS; 37 public uint EveryoneMask = 0;//FULL_MASK_PERMISSIONS;
38 public uint BaseMask = FULL_MASK_PERMISSIONS; 38 public uint BaseMask = 0;//FULL_MASK_PERMISSIONS;
39 39
40 private PrimitiveBaseShape m_Shape; 40 private PrimitiveBaseShape m_Shape;
41 private byte[] m_particleSystem = new byte[0]; 41 private byte[] m_particleSystem = new byte[0];
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 70bd003..a90c5ff 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -217,7 +217,42 @@ namespace OpenSim.Region.Environment.Scenes
217 /// <param name="simClient"></param> 217 /// <param name="simClient"></param>
218 public void DeRezObject(Packet packet, IClientAPI simClient) 218 public void DeRezObject(Packet packet, IClientAPI simClient)
219 { 219 {
220 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
220 221
222
223 if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
224 {
225 //currently following code not used (or don't know of any case of destination being zero
226 }
227 else
228 {
229 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
230 {
231 EntityBase selectedEnt = null;
232 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
233 foreach (EntityBase ent in this.Entities.Values)
234 {
235 if (ent.LocalId == Data.ObjectLocalID)
236 {
237 selectedEnt = ent;
238 break;
239 }
240 }
241 if (selectedEnt != null)
242 {
243 List<ScenePresence> avatars = this.RequestAvatarList();
244 foreach (ScenePresence avatar in avatars)
245 {
246 avatar.ControllingClient.SendKillObject(this.m_regionHandle, selectedEnt.LocalId);
247 }
248
249 lock (Entities)
250 {
251 Entities.Remove(selectedEnt.m_uuid);
252 }
253 }
254 }
255 }
221 } 256 }
222 257
223 /// <summary> 258 /// <summary>
@@ -678,7 +713,7 @@ namespace OpenSim.Region.Environment.Scenes
678 asset.InvType = invType; 713 asset.InvType = invType;
679 asset.Type = type; 714 asset.Type = type;
680 asset.FullID = LLUUID.Random(); 715 asset.FullID = LLUUID.Random();
681 asset.Data = new byte[0]; 716 asset.Data = new byte[1];
682 this.assetCache.AddAsset(asset); 717 this.assetCache.AddAsset(asset);
683 718
684 InventoryItemBase item = new InventoryItemBase(); 719 InventoryItemBase item = new InventoryItemBase();
@@ -689,6 +724,7 @@ namespace OpenSim.Region.Environment.Scenes
689 item.inventoryDescription = description; 724 item.inventoryDescription = description;
690 item.inventoryName = name; 725 item.inventoryName = name;
691 item.assetType = invType; 726 item.assetType = invType;
727 item.invType = invType;
692 item.parentFolderID = folderID; 728 item.parentFolderID = folderID;
693 item.inventoryCurrentPermissions = 2147483647; 729 item.inventoryCurrentPermissions = 2147483647;
694 item.inventoryNextPermissions = nextOwnerMask; 730 item.inventoryNextPermissions = nextOwnerMask;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 39584ad..70aead3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Scenes
550 m_estateManager.sendRegionHandshake(client); 550 m_estateManager.sendRegionHandshake(client);
551 CreateAndAddScenePresence(client); 551 CreateAndAddScenePresence(client);
552 m_LandManager.sendParcelOverlay(client); 552 m_LandManager.sendParcelOverlay(client);
553 //commsManager.UserProfiles.AddNewUser(client.AgentId); 553 // commsManager.UserProfiles.AddNewUser(client.AgentId);
554 } 554 }
555 555
556 protected virtual void SubscribeToClientEvents(IClientAPI client) 556 protected virtual void SubscribeToClientEvents(IClientAPI client)
@@ -576,6 +576,7 @@ namespace OpenSim.Region.Environment.Scenes
576 client.OnObjectSelect += SelectPrim; 576 client.OnObjectSelect += SelectPrim;
577 client.OnObjectDeselect += DeselectPrim; 577 client.OnObjectDeselect += DeselectPrim;
578 client.OnGrapUpdate += MoveObject; 578 client.OnGrapUpdate += MoveObject;
579 client.OnDeRezObject += DeRezObject;
579 client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest; 580 client.OnNameFromUUIDRequest += commsManager.HandleUUIDNameRequest;
580 client.OnObjectDescription += PrimDescription; 581 client.OnObjectDescription += PrimDescription;
581 client.OnObjectName += PrimName; 582 client.OnObjectName += PrimName;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index caa359e..4bb48b8 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -459,6 +459,9 @@ namespace OpenSim.Region.Environment.Scenes
459 this.m_scene.InformClientOfNeighbours(this.ControllingClient); 459 this.m_scene.InformClientOfNeighbours(this.ControllingClient);
460 this.newAvatar = false; 460 this.newAvatar = false;
461 } 461 }
462
463 // this.SendFullUpdateToALLClients();
464 // this.SendArrearanceToAllOtherAgents();
462 } 465 }
463 466
464 /// <summary> 467 /// <summary>
@@ -640,7 +643,7 @@ namespace OpenSim.Region.Environment.Scenes
640 } 643 }
641 } 644 }
642 645
643 public static void LoadTextureFile(string name) 646 public static void CreateDefaultTextureEntry(string name)
644 { 647 {
645 /* FileInfo fInfo = new FileInfo(name); 648 /* FileInfo fInfo = new FileInfo(name);
646 long numBytes = fInfo.Length; 649 long numBytes = fInfo.Length;