ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics ( i hope)

Browse Source
This commit is contained in:
UbitUmarov
2020-08-07 22:10:53 +01:00
parent af3581ba2e
commit fb54ca39d1
15 changed files with 353 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
View File

@@ -39,7 +39,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
private AssetBase m_asset;
public delegate void TerrainUploadComplete(string name, byte[] filedata, IClientAPI remoteClient);
public event TerrainUploadComplete TerrainUploadDone;
//private string m_description = String.Empty;
@@ -48,15 +47,16 @@ namespace OpenSim.Region.CoreModules.World.Estate
private sbyte type = 0;
public ulong mXferID;
private TerrainUploadComplete handlerTerrainUploadDone;
public EstateTerrainXferHandler(IClientAPI pRemoteClient, string pClientFilename)
{
m_asset = new AssetBase(UUID.Zero, pClientFilename, type, pRemoteClient.AgentId.ToString());
m_asset.Data = new byte[0];
m_asset.Description = "empty";
m_asset.Local = true;
m_asset.Temporary = true;
m_asset = new AssetBase(UUID.Zero, pClientFilename, type, pRemoteClient.AgentId.ToString())
{
Data = new byte[0],
Description = "empty",
Local = true,
Temporary = true
};
}
public ulong XferID
@@ -108,11 +108,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
public void SendCompleteMessage(IClientAPI remoteClient)
{
handlerTerrainUploadDone = TerrainUploadDone;
if (handlerTerrainUploadDone != null)
{
handlerTerrainUploadDone(m_asset.Name, m_asset.Data, remoteClient);
}
TerrainUploadDone?.Invoke(m_asset.Name, m_asset.Data, remoteClient);
}
}
}

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -1756,7 +1756,7 @@ namespace OpenSim.Region.CoreModules.World.Land
foreach (SceneObjectGroup obj in primsOverMe)
{
if(m_scene.Permissions.CanSellObject(previousOwner,obj, (byte)SaleType.Original))
m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0);
m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, (byte)SaleType.Original, 0);
}
}
}