diff options
| author | KittoFlora | 2009-11-15 22:20:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-15 22:20:51 +0100 |
| commit | ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee (patch) | |
| tree | e218f290178d98e63aa8ab6aef46c1715195c32e /OpenSim/Region/CoreModules/World/Estate | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make GroupRootUpdate be a terse update. This method is not used by opensim (i... (diff) | |
| download | opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.zip opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.gz opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.bz2 opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs index ddac515..2ff635b 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs | |||
| @@ -52,16 +52,11 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 52 | 52 | ||
| 53 | public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) | 53 | public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename) |
| 54 | { | 54 | { |
| 55 | 55 | m_asset = new AssetBase(UUID.Zero, pClientFilename, type); | |
| 56 | m_asset = new AssetBase(); | ||
| 57 | m_asset.FullID = UUID.Zero; | ||
| 58 | m_asset.Type = type; | ||
| 59 | m_asset.Data = new byte[0]; | 56 | m_asset.Data = new byte[0]; |
| 60 | m_asset.Name = pClientFilename; | ||
| 61 | m_asset.Description = "empty"; | 57 | m_asset.Description = "empty"; |
| 62 | m_asset.Local = true; | 58 | m_asset.Local = true; |
| 63 | m_asset.Temporary = true; | 59 | m_asset.Temporary = true; |
| 64 | |||
| 65 | } | 60 | } |
| 66 | 61 | ||
| 67 | public ulong XferID | 62 | public ulong XferID |