diff options
author | MW | 2007-07-29 13:05:57 +0000 |
---|---|---|
committer | MW | 2007-07-29 13:05:57 +0000 |
commit | 5ee2e38c11785e9b68ecf1767af7a4ea5b13b7c7 (patch) | |
tree | 53cd656a91fd400f8bb46768ab070a96f88ae238 /OpenSim/Region/ClientStack | |
parent | * Primitives no longer walk around while being rescaled. (diff) | |
download | opensim-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/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 2 |
2 files changed, 3 insertions, 3 deletions
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 | |||
506 | OutPacket(pc); | 506 | OutPacket(pc); |
507 | } | 507 | } |
508 | 508 | ||
509 | public void SendKillObject(ulong regionHandle, uint avatarLocalID) | 509 | public void SendKillObject(ulong regionHandle, uint localID) |
510 | { | 510 | { |
511 | KillObjectPacket kill = new KillObjectPacket(); | 511 | KillObjectPacket kill = new KillObjectPacket(); |
512 | kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; | 512 | kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; |
513 | kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); | 513 | kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); |
514 | kill.ObjectData[0].ID = avatarLocalID; | 514 | kill.ObjectData[0].ID = localID; |
515 | OutPacket(kill); | 515 | OutPacket(kill); |
516 | } | 516 | } |
517 | 517 | ||
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 | |||
70 | 70 | ||
71 | Initialize(); | 71 | Initialize(); |
72 | 72 | ||
73 | ScenePresence.LoadTextureFile("avatar-texture.dat"); | 73 | ScenePresence.CreateDefaultTextureEntry("avatar-texture.dat"); |
74 | 74 | ||
75 | m_httpServer = new BaseHttpServer( m_httpServerPort ); | 75 | m_httpServer = new BaseHttpServer( m_httpServerPort ); |
76 | 76 | ||