Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2011-12-29 12:18:22 -0800
committer: Diva Canto 2011-12-29 12:18:22 -0800
commit: b7560772697e4ca437b4b6c4b702d538266b086d (patch)
tree: 9b005feb13bafcc79fc9fe3b8aaf3a0deb6ef3e9 /OpenSim/Region/ScriptEngine/Shared/Api
parent: HG: more adjustments for making HG Simian work. Added server_uri as new key o... (diff)
parent: Introduce a LightShare kill packet ans send it when needed. Currently only (diff)
download: opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.zip
opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.tar.gz
opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.tar.bz2
opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index cb0d765..77a784d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -486,6 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
            m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false;
            if (m_host.ParentGroup.Scene.SimulationDataService != null)
                m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID);
+            m_host.ParentGroup.Scene.EventManager.TriggerOnSaveNewWindlightProfile();
        }
        /// <summary>
        /// Set the current Windlight scene to a target avatar
author	Diva Canto	2011-12-29 12:18:22 -0800
committer	Diva Canto	2011-12-29 12:18:22 -0800
commit	b7560772697e4ca437b4b6c4b702d538266b086d (patch)
tree	9b005feb13bafcc79fc9fe3b8aaf3a0deb6ef3e9 /OpenSim/Region/ScriptEngine/Shared/Api
parent	HG: more adjustments for making HG Simian work. Added server_uri as new key o... (diff)
parent	Introduce a LightShare kill packet ans send it when needed. Currently only (diff)
download	opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.zip opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.tar.gz opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.tar.bz2 opensim-SC_OLD-b7560772697e4ca437b4b6c4b702d538266b086d.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs index cb0d765..77a784d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -486,6 +486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
486	m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false;	486	m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.valid = false;
487	if (m_host.ParentGroup.Scene.SimulationDataService != null)	487	if (m_host.ParentGroup.Scene.SimulationDataService != null)
488	m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID);	488	m_host.ParentGroup.Scene.SimulationDataService.RemoveRegionWindlightSettings(m_host.ParentGroup.Scene.RegionInfo.RegionID);
		489	m_host.ParentGroup.Scene.EventManager.TriggerOnSaveNewWindlightProfile();
489	}	490	}
490	/// <summary>	491	/// <summary>
491	/// Set the current Windlight scene to a target avatar	492	/// Set the current Windlight scene to a target avatar