ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace lightshare early work

Browse Source
This commit is contained in:
UbitUmarov
2020-06-10 09:26:55 +01:00
parent 0d76635113
commit e2be90caaf
23 changed files with 1917 additions and 1457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs
View File

@@ -33,8 +33,8 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IEnvironmentModule
{
void ResetEnvironmentSettings(UUID regionUUID);
//void FromLightShare(RegionLightShareData wl);
//RegionLightShareData ToLightShare();
//byte[] GetDefaultAssetData(string name);
void FromLightShare(RegionLightShareData wl);
RegionLightShareData ToLightShare();
byte[] GetDefaultAssetData(int type);
}
}

3
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
View File

@@ -109,9 +109,6 @@ namespace OpenSim.Region.Framework.Interfaces
void StoreRegionSettings(RegionSettings rs);
RegionSettings LoadRegionSettings(UUID regionUUID);
RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
void StoreRegionWindlightSettings(RegionLightShareData wl);
void RemoveRegionWindlightSettings(UUID regionID);
/// <summary>
/// Load Environment settings from region storage

4
OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
View File

@@ -121,9 +121,7 @@ namespace OpenSim.Region.Framework.Interfaces
void StoreRegionSettings(RegionSettings rs);
RegionSettings LoadRegionSettings(UUID regionUUID);
RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
void StoreRegionWindlightSettings(RegionLightShareData wl);
void RemoveRegionWindlightSettings(UUID regionID);
UUID[] GetObjectIDs(UUID regionID);
/// <summary>

24
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@@ -720,9 +720,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks>
public event OnMakeChildAgentDelegate OnMakeChildAgent;
public delegate void OnSaveNewWindlightProfileDelegate();
public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionLightShareData wl, UUID user);
/// <summary>
/// Triggered after the grunt work for adding a root agent to a
/// scene has been performed (resuming attachment scripts, physics,
@@ -739,9 +736,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks>
public event Action<ScenePresence> OnMakeRootAgent;
public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted;
public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile;
/// <summary>
/// Triggered when an object or attachment enters a scene
/// </summary>
@@ -2160,24 +2154,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public void TriggerOnSendNewWindlightProfileTargeted(RegionLightShareData wl, UUID user)
{
OnSendNewWindlightProfileTargetedDelegate handlerSendNewWindlightProfileTargeted = OnSendNewWindlightProfileTargeted;
if (handlerSendNewWindlightProfileTargeted != null)
{
handlerSendNewWindlightProfileTargeted(wl, user);
}
}
public void TriggerOnSaveNewWindlightProfile()
{
OnSaveNewWindlightProfileDelegate handlerSaveNewWindlightProfile = OnSaveNewWindlightProfile;
if (handlerSaveNewWindlightProfile != null)
{
handlerSaveNewWindlightProfile();
}
}
public void TriggerOnMakeRootAgent(ScenePresence presence)
{
Action<ScenePresence> handlerMakeRootAgent = OnMakeRootAgent;

20
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -2123,17 +2123,17 @@ namespace OpenSim.Region.Framework.Scenes
SimulationDataService.StoreBakedTerrain(Bakedmap.GetTerrainData(), RegionInfo.RegionID);
}
public void StoreWindlightProfile(RegionLightShareData wl)
private ViewerEnviroment m_regionEnviroment;
public ViewerEnviroment RegionEnviroment
{
RegionInfo.WindlightSettings = wl;
SimulationDataService.StoreRegionWindlightSettings(wl);
m_eventManager.TriggerOnSaveNewWindlightProfile();
}
public void LoadWindlightProfile()
{
RegionInfo.WindlightSettings = SimulationDataService.LoadRegionWindlightSettings(RegionInfo.RegionID);
m_eventManager.TriggerOnSaveNewWindlightProfile();
get
{
return m_regionEnviroment;
}
set
{
m_regionEnviroment = value;
}
}
/// <summary>