diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index a86e263..68e73b1 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -194,7 +194,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
194 | 194 | ||
195 | public delegate void OnMakeRootAgentDelegate(ScenePresence presence); | 195 | public delegate void OnMakeRootAgentDelegate(ScenePresence presence); |
196 | public delegate void OnSaveNewWindlightProfileDelegate(); | 196 | public delegate void OnSaveNewWindlightProfileDelegate(); |
197 | public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionMeta7WindlightData wl, UUID user); | ||
197 | public event OnMakeRootAgentDelegate OnMakeRootAgent; | 198 | public event OnMakeRootAgentDelegate OnMakeRootAgent; |
199 | public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted; | ||
198 | public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile; | 200 | public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile; |
199 | 201 | ||
200 | public delegate void NewInventoryItemUploadComplete(UUID avatarID, UUID assetID, string name, int userlevel); | 202 | public delegate void NewInventoryItemUploadComplete(UUID avatarID, UUID assetID, string name, int userlevel); |
@@ -414,6 +416,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
414 | private ClientClosed handlerClientClosed = null; //OnClientClosed; | 416 | private ClientClosed handlerClientClosed = null; //OnClientClosed; |
415 | private OnMakeChildAgentDelegate handlerMakeChildAgent = null; //OnMakeChildAgent; | 417 | private OnMakeChildAgentDelegate handlerMakeChildAgent = null; //OnMakeChildAgent; |
416 | private OnSaveNewWindlightProfileDelegate handlerSaveNewWindlightProfile = null; //OnSaveNewWindlightProfile; | 418 | private OnSaveNewWindlightProfileDelegate handlerSaveNewWindlightProfile = null; //OnSaveNewWindlightProfile; |
419 | private OnSendNewWindlightProfileTargetedDelegate handlerSendNewWindlightProfileTargeted = null; //OnSendNewWindlightProfileTargeted; | ||
417 | private OnMakeRootAgentDelegate handlerMakeRootAgent = null; //OnMakeRootAgent; | 420 | private OnMakeRootAgentDelegate handlerMakeRootAgent = null; //OnMakeRootAgent; |
418 | private OnTerrainTickDelegate handlerTerrainTick = null; // OnTerainTick; | 421 | private OnTerrainTickDelegate handlerTerrainTick = null; // OnTerainTick; |
419 | private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps; | 422 | private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps; |
@@ -775,6 +778,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
775 | } | 778 | } |
776 | } | 779 | } |
777 | 780 | ||
781 | public void TriggerOnSendNewWindlightProfileTargeted(RegionMeta7WindlightData wl, UUID user) | ||
782 | { | ||
783 | handlerSendNewWindlightProfileTargeted = OnSendNewWindlightProfileTargeted; | ||
784 | if (handlerSendNewWindlightProfileTargeted != null) | ||
785 | { | ||
786 | handlerSendNewWindlightProfileTargeted(wl, user); | ||
787 | } | ||
788 | } | ||
789 | |||
778 | public void TriggerOnSaveNewWindlightProfile() | 790 | public void TriggerOnSaveNewWindlightProfile() |
779 | { | 791 | { |
780 | handlerSaveNewWindlightProfile = OnSaveNewWindlightProfile; | 792 | handlerSaveNewWindlightProfile = OnSaveNewWindlightProfile; |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 104d22b..20cae5d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1519,8 +1519,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1519 | public void SaveTerrain() | 1519 | public void SaveTerrain() |
1520 | { | 1520 | { |
1521 | m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); | 1521 | m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); |
1522 | } | 1522 | } |
1523 | 1523 | ||
1524 | public void StoreWindlightProfile(RegionMeta7WindlightData wl) | 1524 | public void StoreWindlightProfile(RegionMeta7WindlightData wl) |
1525 | { | 1525 | { |
1526 | m_regInfo.WindlightSettings = wl; | 1526 | m_regInfo.WindlightSettings = wl; |