* Refactor

* Break out common BasicDOSProtector code into separate class.

2 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index ed4b205..ff87ece 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -53,10 +53,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                                           {
                                               AllowXForwardedFor = true,
                                               ForgetTimeSpan = TimeSpan.FromMinutes(2),
-                                              MaxRequestsInTimeframe = 5,
+                                              MaxRequestsInTimeframe = 20,
                                               ReportingName = "FRIENDSDOSPROTECTOR",
                                               RequestTimeSpan = TimeSpan.FromSeconds(5),
-                                              ThrottledAction = ThrottleAction.DoThrottledMethod
+                                              ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
                                           })
         {
             m_FriendsModule = fmodule;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0f05e07..cdf1467 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         MaxRequestsInTimeframe = 4,
                         ReportingName = "MAPDOSPROTECTOR",
                         RequestTimeSpan = TimeSpan.FromSeconds(10),
-                        ThrottledAction = ThrottleAction.DoThrottledMethod
+                        ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
                     }).Process);
             MainServer.Instance.AddLLSDHandler(
                 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
@@ -1094,7 +1094,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             Hashtable reply = new Hashtable();
             int statuscode = 500;
-            reply["str_response_string"] = "I blocked you! HAHAHAHAHAHAHHAHAH";
+            reply["str_response_string"] = "";
             reply["int_response_code"] = statuscode;
             reply["content_type"] = "text/plain";
             return reply;