diff options
| author | Melanie | 2013-05-11 02:35:26 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-11 02:35:26 +0100 |
| commit | 13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch) | |
| tree | 41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2 opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 50d8a73..729667c 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -1909,7 +1909,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 1909 | m_log.Info("[RADMIN]: Received Estate Reload Request"); | 1909 | m_log.Info("[RADMIN]: Received Estate Reload Request"); |
| 1910 | 1910 | ||
| 1911 | Hashtable responseData = (Hashtable)response.Value; | 1911 | Hashtable responseData = (Hashtable)response.Value; |
| 1912 | Hashtable requestData = (Hashtable)request.Params[0]; | 1912 | // Hashtable requestData = (Hashtable)request.Params[0]; |
| 1913 | 1913 | ||
| 1914 | m_application.SceneManager.ForEachScene(s => | 1914 | m_application.SceneManager.ForEachScene(s => |
| 1915 | s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false) | 1915 | s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false) |