diff options
author | Diva Canto | 2012-09-21 17:59:42 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-21 17:59:42 -0700 |
commit | ebd99c9e3ea4170887eaeb60d590659ce32f474c (patch) | |
tree | b2ce3ff6a1b77d7bc8781d1ae4b8d60251974fde /OpenSim/ApplicationPlugins | |
parent | This fixes HG attachments' missing assets (textures, etc). (diff) | |
parent | Remove deprecated parameters for region_id. (diff) | |
download | opensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.zip opensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.tar.gz opensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.tar.bz2 opensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index a5e56f9..5d80ba9 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -728,7 +728,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
728 | responseData["success"] = true; | 728 | responseData["success"] = true; |
729 | responseData["region_name"] = region.RegionName; | 729 | responseData["region_name"] = region.RegionName; |
730 | responseData["region_id"] = region.RegionID.ToString(); | 730 | responseData["region_id"] = region.RegionID.ToString(); |
731 | responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012 | ||
732 | 731 | ||
733 | m_log.Info("[RADMIN]: CreateRegion: request complete"); | 732 | m_log.Info("[RADMIN]: CreateRegion: request complete"); |
734 | } | 733 | } |
@@ -1881,29 +1880,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1881 | { | 1880 | { |
1882 | return; | 1881 | return; |
1883 | } | 1882 | } |
1884 | #region Deprecate July 2012 | ||
1885 | //region_ID, regionid, region_uuid will be deprecated in July 2012!!!!!! | ||
1886 | else if (requestData.ContainsKey("regionid") && | ||
1887 | !String.IsNullOrEmpty((string)requestData["regionid"])) | ||
1888 | { | ||
1889 | m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead"); | ||
1890 | } | ||
1891 | else if (requestData.ContainsKey("region_ID") && | ||
1892 | !String.IsNullOrEmpty((string)requestData["region_ID"])) | ||
1893 | { | ||
1894 | m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead"); | ||
1895 | } | ||
1896 | else if (requestData.ContainsKey("regionID") && | ||
1897 | !String.IsNullOrEmpty((string)requestData["regionID"])) | ||
1898 | { | ||
1899 | m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead"); | ||
1900 | } | ||
1901 | else if (requestData.ContainsKey("region_uuid") && | ||
1902 | !String.IsNullOrEmpty((string)requestData["region_uuid"])) | ||
1903 | { | ||
1904 | m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead"); | ||
1905 | } | ||
1906 | #endregion | ||
1907 | else | 1883 | else |
1908 | { | 1884 | { |
1909 | responseData["accepted"] = false; | 1885 | responseData["accepted"] = false; |
@@ -1925,56 +1901,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1925 | throw new Exception(String.Format("Region ID {0} not found", regionID)); | 1901 | throw new Exception(String.Format("Region ID {0} not found", regionID)); |
1926 | } | 1902 | } |
1927 | } | 1903 | } |
1928 | #region Deprecate July 2012 | ||
1929 | else if (requestData.ContainsKey("regionid") && | ||
1930 | !String.IsNullOrEmpty((string)requestData["regionid"])) | ||
1931 | { | ||
1932 | m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead"); | ||
1933 | |||
1934 | UUID regionID = (UUID)(string)requestData["regionid"]; | ||
1935 | if (!m_application.SceneManager.TryGetScene(regionID, out scene)) | ||
1936 | { | ||
1937 | responseData["error"] = String.Format("Region ID {0} not found", regionID); | ||
1938 | throw new Exception(String.Format("Region ID {0} not found", regionID)); | ||
1939 | } | ||
1940 | } | ||
1941 | else if (requestData.ContainsKey("region_ID") && | ||
1942 | !String.IsNullOrEmpty((string)requestData["region_ID"])) | ||
1943 | { | ||
1944 | m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead"); | ||
1945 | |||
1946 | UUID regionID = (UUID)(string)requestData["region_ID"]; | ||
1947 | if (!m_application.SceneManager.TryGetScene(regionID, out scene)) | ||
1948 | { | ||
1949 | responseData["error"] = String.Format("Region ID {0} not found", regionID); | ||
1950 | throw new Exception(String.Format("Region ID {0} not found", regionID)); | ||
1951 | } | ||
1952 | } | ||
1953 | else if (requestData.ContainsKey("regionID") && | ||
1954 | !String.IsNullOrEmpty((string)requestData["regionID"])) | ||
1955 | { | ||
1956 | m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead"); | ||
1957 | |||
1958 | UUID regionID = (UUID)(string)requestData["regionID"]; | ||
1959 | if (!m_application.SceneManager.TryGetScene(regionID, out scene)) | ||
1960 | { | ||
1961 | responseData["error"] = String.Format("Region ID {0} not found", regionID); | ||
1962 | throw new Exception(String.Format("Region ID {0} not found", regionID)); | ||
1963 | } | ||
1964 | } | ||
1965 | else if (requestData.ContainsKey("region_uuid") && | ||
1966 | !String.IsNullOrEmpty((string)requestData["region_uuid"])) | ||
1967 | { | ||
1968 | m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead"); | ||
1969 | |||
1970 | UUID regionID = (UUID)(string)requestData["region_uuid"]; | ||
1971 | if (!m_application.SceneManager.TryGetScene(regionID, out scene)) | ||
1972 | { | ||
1973 | responseData["error"] = String.Format("Region ID {0} not found", regionID); | ||
1974 | throw new Exception(String.Format("Region ID {0} not found", regionID)); | ||
1975 | } | ||
1976 | } | ||
1977 | #endregion | ||
1978 | else if (requestData.ContainsKey("region_name") && | 1904 | else if (requestData.ContainsKey("region_name") && |
1979 | !String.IsNullOrEmpty((string)requestData["region_name"])) | 1905 | !String.IsNullOrEmpty((string)requestData["region_name"])) |
1980 | { | 1906 | { |