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
                 responseData["success"] = true;
                 responseData["region_name"] = region.RegionName;
                 responseData["region_id"] = region.RegionID.ToString();
-                responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012
 
                 m_log.Info("[RADMIN]: CreateRegion: request complete");
             }
@@ -2015,29 +2014,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 return;
             }
-            #region Deprecate July 2012
-            //region_ID, regionid, region_uuid will be deprecated in July 2012!!!!!!
-            else if (requestData.ContainsKey("regionid") &&
-                !String.IsNullOrEmpty((string)requestData["regionid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("region_ID") &&
-                !String.IsNullOrEmpty((string)requestData["region_ID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("regionID") &&
-                !String.IsNullOrEmpty((string)requestData["regionID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
-            }
-            else if (requestData.ContainsKey("region_uuid") &&
-                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
-            }
-            #endregion
             else
             {
                 responseData["accepted"] = false;
@@ -2059,56 +2035,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     throw new Exception(String.Format("Region ID {0} not found", regionID));
                 }
             }
-            #region Deprecate July 2012
-            else if (requestData.ContainsKey("regionid") &&
-                !String.IsNullOrEmpty((string)requestData["regionid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["regionid"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("region_ID") &&
-                !String.IsNullOrEmpty((string)requestData["region_ID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["region_ID"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("regionID") &&
-                !String.IsNullOrEmpty((string)requestData["regionID"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["regionID"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            else if (requestData.ContainsKey("region_uuid") &&
-                !String.IsNullOrEmpty((string)requestData["region_uuid"]))
-            {
-                m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
-
-                UUID regionID = (UUID)(string)requestData["region_uuid"];
-                if (!m_application.SceneManager.TryGetScene(regionID, out scene))
-                {
-                    responseData["error"] = String.Format("Region ID {0} not found", regionID);
-                    throw new Exception(String.Format("Region ID {0} not found", regionID));
-                }
-            }
-            #endregion
             else if (requestData.ContainsKey("region_name") &&
                 !String.IsNullOrEmpty((string)requestData["region_name"]))
             {