From 5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 29 Jul 2007 13:05:57 +0000
Subject: 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.

---
 OpenSim/Region/ClientStack/ClientView.API.cs        | 4 ++--
 OpenSim/Region/ClientStack/RegionApplicationBase.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 2733f0a..4b0352b 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -506,12 +506,12 @@ namespace OpenSim.Region.ClientStack
             OutPacket(pc);
         }
 
-        public void SendKillObject(ulong regionHandle, uint avatarLocalID)
+        public void SendKillObject(ulong regionHandle, uint localID)
         {
             KillObjectPacket kill = new KillObjectPacket();
             kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
             kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
-            kill.ObjectData[0].ID = avatarLocalID;
+            kill.ObjectData[0].ID = localID;
             OutPacket(kill);
         }
 
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index bad7fec..008b4c7 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ClientStack
 
             Initialize();
             
-            ScenePresence.LoadTextureFile("avatar-texture.dat");
+            ScenePresence.CreateDefaultTextureEntry("avatar-texture.dat");
 
             m_httpServer = new BaseHttpServer( m_httpServerPort );
 
-- 
cgit v1.1