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

author: Melanie 2013-05-11 01:29:30 +0100
committer: Melanie 2013-05-11 01:29:30 +0100
commit: 55c9bc15e571065f66190e017f973f6e1ac43428 (patch)
tree: 537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
parent: Send up the part missing from the Avination Estate commit. (diff)
parent: BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff)
download: opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.zip
opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz
opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2
opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index ad683b8..3abf40b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1768,7 +1768,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
            m_log.Info("[RADMIN]: Received Estate Reload Request");
            Hashtable responseData = (Hashtable)response.Value;
-            Hashtable requestData = (Hashtable)request.Params[0];
+//            Hashtable requestData = (Hashtable)request.Params[0];
            m_application.SceneManager.ForEachScene(s => 
                s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)
author	Melanie	2013-05-11 01:29:30 +0100
committer	Melanie	2013-05-11 01:29:30 +0100
commit	55c9bc15e571065f66190e017f973f6e1ac43428 (patch)
tree	537b8c95902bf343d8aeeef52a38124e0ba7e701 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
parent	Send up the part missing from the Avination Estate commit. (diff)
parent	BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff)
download	opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index ad683b8..3abf40b 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1768,7 +1768,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1768	m_log.Info("[RADMIN]: Received Estate Reload Request");	1768	m_log.Info("[RADMIN]: Received Estate Reload Request");
1769		1769
1770	Hashtable responseData = (Hashtable)response.Value;	1770	Hashtable responseData = (Hashtable)response.Value;
1771	Hashtable requestData = (Hashtable)request.Params[0];	1771	// Hashtable requestData = (Hashtable)request.Params[0];
1772		1772
1773	m_application.SceneManager.ForEachScene(s =>	1773	m_application.SceneManager.ForEachScene(s =>
1774	s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)	1774	s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)