diff options
| author | MW | 2007-03-25 20:23:06 +0000 |
|---|---|---|
| committer | MW | 2007-03-25 20:23:06 +0000 |
| commit | 84c2a72140822fc28da3590b48db392d132ef0ea (patch) | |
| tree | f7060653bc50070a48cd86f6940381dbde32c910 /OpenSim.RegionServer/SimClient.cs | |
| parent | * Hopefully it builds again... (diff) | |
| download | opensim-SC_OLD-84c2a72140822fc28da3590b48db392d132ef0ea.zip opensim-SC_OLD-84c2a72140822fc28da3590b48db392d132ef0ea.tar.gz opensim-SC_OLD-84c2a72140822fc28da3590b48db392d132ef0ea.tar.bz2 opensim-SC_OLD-84c2a72140822fc28da3590b48db392d132ef0ea.tar.xz | |
Hopefully fixed the texture uploading and the crashing when a prim with a uploaded texture on it is moved.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 9ae1baf..dea385c 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
| @@ -281,15 +281,15 @@ namespace OpenSim | |||
| 281 | case PacketType.AssetUploadRequest: | 281 | case PacketType.AssetUploadRequest: |
| 282 | //this.debug = true; | 282 | //this.debug = true; |
| 283 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; | 283 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; |
| 284 | Console.WriteLine(Pack.ToString()); | 284 | // Console.WriteLine(Pack.ToString()); |
| 285 | if (request.AssetBlock.Type == 0) | 285 | // if (request.AssetBlock.Type == 0) |
| 286 | { | 286 | // { |
| 287 | this.UploadAssets.HandleUploadPacket(request, LLUUID.Random()); | 287 | //this.UploadAssets.HandleUploadPacket(request, LLUUID.Random()); |
| 288 | } | 288 | //} |
| 289 | else | 289 | //else |
| 290 | { | 290 | //{*/ |
| 291 | this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); | 291 | this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID)); |
| 292 | } | 292 | //} |
| 293 | break; | 293 | break; |
| 294 | case PacketType.SendXferPacket: | 294 | case PacketType.SendXferPacket: |
| 295 | Console.WriteLine(Pack.ToString()); | 295 | Console.WriteLine(Pack.ToString()); |