aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs74
1 files changed, 0 insertions, 74 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 202d199..4473ee0 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -852,7 +852,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
852 responseData["success"] = true; 852 responseData["success"] = true;
853 responseData["region_name"] = region.RegionName; 853 responseData["region_name"] = region.RegionName;
854 responseData["region_id"] = region.RegionID.ToString(); 854 responseData["region_id"] = region.RegionID.ToString();
855 responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012
856 855
857 m_log.Info("[RADMIN]: CreateRegion: request complete"); 856 m_log.Info("[RADMIN]: CreateRegion: request complete");
858 } 857 }
@@ -2015,29 +2014,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2015 { 2014 {
2016 return; 2015 return;
2017 } 2016 }
2018 #region Deprecate July 2012
2019 //region_ID, regionid, region_uuid will be deprecated in July 2012!!!!!!
2020 else if (requestData.ContainsKey("regionid") &&
2021 !String.IsNullOrEmpty((string)requestData["regionid"]))
2022 {
2023 m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
2024 }
2025 else if (requestData.ContainsKey("region_ID") &&
2026 !String.IsNullOrEmpty((string)requestData["region_ID"]))
2027 {
2028 m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
2029 }
2030 else if (requestData.ContainsKey("regionID") &&
2031 !String.IsNullOrEmpty((string)requestData["regionID"]))
2032 {
2033 m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
2034 }
2035 else if (requestData.ContainsKey("region_uuid") &&
2036 !String.IsNullOrEmpty((string)requestData["region_uuid"]))
2037 {
2038 m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
2039 }
2040 #endregion
2041 else 2017 else
2042 { 2018 {
2043 responseData["accepted"] = false; 2019 responseData["accepted"] = false;
@@ -2059,56 +2035,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2059 throw new Exception(String.Format("Region ID {0} not found", regionID)); 2035 throw new Exception(String.Format("Region ID {0} not found", regionID));
2060 } 2036 }
2061 } 2037 }
2062 #region Deprecate July 2012
2063 else if (requestData.ContainsKey("regionid") &&
2064 !String.IsNullOrEmpty((string)requestData["regionid"]))
2065 {
2066 m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
2067
2068 UUID regionID = (UUID)(string)requestData["regionid"];
2069 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
2070 {
2071 responseData["error"] = String.Format("Region ID {0} not found", regionID);
2072 throw new Exception(String.Format("Region ID {0} not found", regionID));
2073 }
2074 }
2075 else if (requestData.ContainsKey("region_ID") &&
2076 !String.IsNullOrEmpty((string)requestData["region_ID"]))
2077 {
2078 m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
2079
2080 UUID regionID = (UUID)(string)requestData["region_ID"];
2081 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
2082 {
2083 responseData["error"] = String.Format("Region ID {0} not found", regionID);
2084 throw new Exception(String.Format("Region ID {0} not found", regionID));
2085 }
2086 }
2087 else if (requestData.ContainsKey("regionID") &&
2088 !String.IsNullOrEmpty((string)requestData["regionID"]))
2089 {
2090 m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
2091
2092 UUID regionID = (UUID)(string)requestData["regionID"];
2093 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
2094 {
2095 responseData["error"] = String.Format("Region ID {0} not found", regionID);
2096 throw new Exception(String.Format("Region ID {0} not found", regionID));
2097 }
2098 }
2099 else if (requestData.ContainsKey("region_uuid") &&
2100 !String.IsNullOrEmpty((string)requestData["region_uuid"]))
2101 {
2102 m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
2103
2104 UUID regionID = (UUID)(string)requestData["region_uuid"];
2105 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
2106 {
2107 responseData["error"] = String.Format("Region ID {0} not found", regionID);
2108 throw new Exception(String.Format("Region ID {0} not found", regionID));
2109 }
2110 }
2111 #endregion
2112 else if (requestData.ContainsKey("region_name") && 2038 else if (requestData.ContainsKey("region_name") &&
2113 !String.IsNullOrEmpty((string)requestData["region_name"])) 2039 !String.IsNullOrEmpty((string)requestData["region_name"]))
2114 { 2040 {