Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

63 files changed, 106 insertions, 27 deletions

diff --git a/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll
index b00cf1d..b00cf1d 100644..100755
--- a/bin/Axiom.MathLib.dll
+++ b/bin/Axiom.MathLib.dll
diff --git a/bin/BulletDotNET.dll b/bin/BulletDotNET.dll
index 40c4348..40c4348 100644..100755
--- a/bin/BulletDotNET.dll
+++ b/bin/BulletDotNET.dll
diff --git a/bin/C5.dll b/bin/C5.dll
index 1234ce9..1234ce9 100644..100755
--- a/bin/C5.dll
+++ b/bin/C5.dll
diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
index 238291f..238291f 100644..100755
--- a/bin/CSJ2K.dll
+++ b/bin/CSJ2K.dll
diff --git a/bin/Castle.Core.dll b/bin/Castle.Core.dll
deleted file mode 100644
index 2464e66..0000000
--- a/bin/Castle.Core.dll
+++ /dev/null
diff --git a/bin/Castle.DynamicProxy.dll b/bin/Castle.DynamicProxy.dll
deleted file mode 100644
index 8540495..0000000
--- a/bin/Castle.DynamicProxy.dll
+++ /dev/null
diff --git a/bin/Castle.DynamicProxy2.dll b/bin/Castle.DynamicProxy2.dll
deleted file mode 100644
index 83e192e..0000000
--- a/bin/Castle.DynamicProxy2.dll
+++ /dev/null
diff --git a/bin/Community.CsharpSqlite.Sqlite.dll b/bin/Community.CsharpSqlite.Sqlite.dll
index 93ac7bd..93ac7bd 100644..100755
--- a/bin/Community.CsharpSqlite.Sqlite.dll
+++ b/bin/Community.CsharpSqlite.Sqlite.dll
diff --git a/bin/Community.CsharpSqlite.dll b/bin/Community.CsharpSqlite.dll
index a2e4513..a2e4513 100644..100755
--- a/bin/Community.CsharpSqlite.dll
+++ b/bin/Community.CsharpSqlite.dll
diff --git a/bin/CookComputing.XmlRpcV2.dll b/bin/CookComputing.XmlRpcV2.dll
index 4dd869c..4dd869c 100644..100755
--- a/bin/CookComputing.XmlRpcV2.dll
+++ b/bin/CookComputing.XmlRpcV2.dll
diff --git a/bin/DotNetOpenId.dll b/bin/DotNetOpenId.dll
index aa62790..aa62790 100644..100755
--- a/bin/DotNetOpenId.dll
+++ b/bin/DotNetOpenId.dll
diff --git a/bin/DotNetOpenMail.dll b/bin/DotNetOpenMail.dll
index 70af3bf..70af3bf 100644..100755
--- a/bin/DotNetOpenMail.dll
+++ b/bin/DotNetOpenMail.dll
diff --git a/bin/DotSets.dll b/bin/DotSets.dll
deleted file mode 100644
index 5225651..0000000
--- a/bin/DotSets.dll
+++ /dev/null
diff --git a/bin/Fadd.Globalization.Yaml.dll b/bin/Fadd.Globalization.Yaml.dll
index 66a0706..66a0706 100644..100755
--- a/bin/Fadd.Globalization.Yaml.dll
+++ b/bin/Fadd.Globalization.Yaml.dll
diff --git a/bin/Fadd.dll b/bin/Fadd.dll
index 06183f1..06183f1 100644..100755
--- a/bin/Fadd.dll
+++ b/bin/Fadd.dll
diff --git a/bin/GlynnTucker.Cache.dll b/bin/GlynnTucker.Cache.dll
index c6ab8d5..c6ab8d5 100644..100755
--- a/bin/GlynnTucker.Cache.dll
+++ b/bin/GlynnTucker.Cache.dll
diff --git a/bin/Google.ProtocolBuffers.dll b/bin/Google.ProtocolBuffers.dll
index 666aa93..666aa93 100644..100755
--- a/bin/Google.ProtocolBuffers.dll
+++ b/bin/Google.ProtocolBuffers.dll
diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll
index 717ceed..717ceed 100644..100755
--- a/bin/HttpServer.dll
+++ b/bin/HttpServer.dll
diff --git a/bin/HttpServer_OpenSim.dll b/bin/HttpServer_OpenSim.dll
index 95ea5dd..95ea5dd 100644..100755
--- a/bin/HttpServer_OpenSim.dll
+++ b/bin/HttpServer_OpenSim.dll
diff --git a/bin/Iesi.Collections.dll b/bin/Iesi.Collections.dll
index 107c362..107c362 100644..100755
--- a/bin/Iesi.Collections.dll
+++ b/bin/Iesi.Collections.dll
diff --git a/bin/Kds.Serialization.dll b/bin/Kds.Serialization.dll
index 7f03277..7f03277 100644..100755
--- a/bin/Kds.Serialization.dll
+++ b/bin/Kds.Serialization.dll
diff --git a/bin/MXP.dll b/bin/MXP.dll
deleted file mode 100644
index 99e90c8..0000000
--- a/bin/MXP.dll
+++ /dev/null
diff --git a/bin/Modified.XnaDevRu.BulletX.dll b/bin/Modified.XnaDevRu.BulletX.dll
index a047f99..a047f99 100644..100755
--- a/bin/Modified.XnaDevRu.BulletX.dll
+++ b/bin/Modified.XnaDevRu.BulletX.dll
diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll
index a1a6382..a1a6382 100644..100755
--- a/bin/Mono.Addins.CecilReflector.dll
+++ b/bin/Mono.Addins.CecilReflector.dll
diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll
index 8aa6d5f..8aa6d5f 100644..100755
--- a/bin/Mono.Addins.Setup.dll
+++ b/bin/Mono.Addins.Setup.dll
diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll
index ea330fd..ea330fd 100644..100755
--- a/bin/Mono.Addins.dll
+++ b/bin/Mono.Addins.dll
diff --git a/bin/Mono.Data.Sqlite.dll b/bin/Mono.Data.Sqlite.dll
index 4f69e0d..4f69e0d 100644..100755
--- a/bin/Mono.Data.Sqlite.dll
+++ b/bin/Mono.Data.Sqlite.dll
diff --git a/bin/Mono.Data.SqliteClient.dll b/bin/Mono.Data.SqliteClient.dll
index 657fbf4..657fbf4 100644..100755
--- a/bin/Mono.Data.SqliteClient.dll
+++ b/bin/Mono.Data.SqliteClient.dll
diff --git a/bin/Mono.PEToolkit.dll b/bin/Mono.PEToolkit.dll
deleted file mode 100644
index b4c3e70..0000000
--- a/bin/Mono.PEToolkit.dll
+++ /dev/null
diff --git a/bin/MonoXnaCompactMaths.dll b/bin/MonoXnaCompactMaths.dll
index 9fe8334..9fe8334 100644..100755
--- a/bin/MonoXnaCompactMaths.dll
+++ b/bin/MonoXnaCompactMaths.dll
diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll
index 992aa56..992aa56 100644..100755
--- a/bin/MySql.Data.dll
+++ b/bin/MySql.Data.dll
diff --git a/bin/NDesk.Options.dll b/bin/NDesk.Options.dll
index df45878..df45878 100644..100755
--- a/bin/NDesk.Options.dll
+++ b/bin/NDesk.Options.dll
diff --git a/bin/Newtonsoft.Json.Net20.dll b/bin/Newtonsoft.Json.Net20.dll
index 177d9b5..177d9b5 100644..100755
--- a/bin/Newtonsoft.Json.Net20.dll
+++ b/bin/Newtonsoft.Json.Net20.dll
diff --git a/bin/Nini.dll b/bin/Nini.dll
index 745057c..745057c 100644..100755
--- a/bin/Nini.dll
+++ b/bin/Nini.dll
diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll
index 33fe6d3..33fe6d3 100644..100755
--- a/bin/Npgsql.dll
+++ b/bin/Npgsql.dll
diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll
index fcf17b1..fcf17b1 100644..100755
--- a/bin/Ode.NET.dll
+++ b/bin/Ode.NET.dll
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index e3b729c..e3b729c 100644..100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 69c4e9b..69c4e9b 100644..100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index cab014d..cab014d 100644..100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index fbaa590..5389b44 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -626,7 +626,7 @@
     ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector
 
     ;; If using a remote connector, specify the server URL
-    ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi
+    ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi
 
 
 [FreeswitchService]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2521c6c..35e8079 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -362,30 +362,24 @@
     ;
     ;client_throttle_max_bps = 196608
 
-    ; Per-client bytes per second rates for the various throttle categories.
-    ; These are default values that will be overriden by clients
-    ;
-    ;resend_default = 12500
-    ;land_default = 1000
-    ;wind_default = 1000
-    ;cloud_default = 1000
-    ;task_default = 1000
-    ;texture_default = 1000
-    ;asset_default = 1000
-    ;state_default = 1000
-
-    ; Per-client maximum burst rates in bytes per second for the various
-    ; throttle categories. These are default values that will be overriden by
-    ; clients
+    ; Adaptive throttling attempts to limit network overload when multiple
+    ; clients login by starting each connection more slowly. Disabled by
+    ; default
     ;
-    ;resend_limit = 18750
-    ;land_limit = 29750
-    ;wind_limit = 18750
-    ;cloud_limit = 18750
-    ;task_limit = 18750
-    ;texture_limit = 55750
-    ;asset_limit = 27500
-    ;state_limit = 37000
+    ;enable_adaptive_throttles = true
+
+    ; Per-client bytes per second rates for the various throttle categories.
+    ; These are default values that will be overriden by clients. These
+    ; defaults are approximately equivalent to the throttles set by the Imprudence
+    ; viewer when maximum bandwidth is set to 350kbps
+
+    ;resend_default = 6625
+    ;land_default = 9125
+    ;wind_default = 1750
+    ;cloud_default = 1750
+    ;task_default = 18500
+    ;texture_default = 18500
+    ;asset_default = 10500
 
     ; Configures how ObjectUpdates are aggregated. These numbers
     ; do not literally mean how many updates will be put in each
@@ -453,7 +447,7 @@
 [Mesh]
     ; enable / disable Collada mesh support
     ; default is true
-    ColladaMesh = true
+    ; AllowMeshUpload = true
 
     ; if you use Meshmerizer and want collisions for meshies, setting this to true
     ; will cause OpenSim to attempt to decode meshies assets, extract the physics
diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll
index 5259ffc..5259ffc 100644..100755
--- a/bin/PhysX-wrapper.dll
+++ b/bin/PhysX-wrapper.dll
diff --git a/bin/PhysX_Wrapper_Dotnet.dll b/bin/PhysX_Wrapper_Dotnet.dll
index c66bf3a..c66bf3a 100644..100755
--- a/bin/PhysX_Wrapper_Dotnet.dll
+++ b/bin/PhysX_Wrapper_Dotnet.dll
diff --git a/bin/PrimMesher.dll b/bin/PrimMesher.dll
index 249e91c..249e91c 100644..100755
--- a/bin/PrimMesher.dll
+++ b/bin/PrimMesher.dll
diff --git a/bin/PumaCode.SvnDotNet.dll b/bin/PumaCode.SvnDotNet.dll
index ff91789..ff91789 100644..100755
--- a/bin/PumaCode.SvnDotNet.dll
+++ b/bin/PumaCode.SvnDotNet.dll
diff --git a/bin/RAIL.dll b/bin/RAIL.dll
deleted file mode 100644
index f2632d7..0000000
--- a/bin/RAIL.dll
+++ /dev/null
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example
index d45fe9d..ff00ddf 100644
--- a/bin/RegionConfig.ini.example
+++ b/bin/RegionConfig.ini.example
@@ -28,6 +28,7 @@ ExternalHostName = "SYSTEMIP"
 ; PhysicalPrimMax = 10
 ; ClampPrimSize = False
 ; MaxPrims = 15000
+; MaxAgents = 100
 
 ; *
 ; * Multi-Tenancy. Only set if needed
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index e2e9624..572497c 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,7 +21,7 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -197,6 +197,23 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     SRV_AssetServerURI = "http://127.0.0.1:8002"
     SRV_ProfileServerURI = "http://127.0.0.1:8002/user"
 
+        ;; Regular expressions for controlling which client versions are accepted/denied.
+        ;; An empty string means nothing is checked.
+        ;;
+        ;; Example 1: allow only these 3 types of clients (any version of them)
+        ;; AllowedClients = "Imprudence|Hippo|Second Life"
+        ;;
+        ;; Example 2: allow all clients except these
+        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+        ;;
+        ;; Note that these are regular expressions, so every character counts.
+        ;; Also note that this is very weak security and should not be trusted as a reliable means
+        ;; for keeping bad clients out; modified clients can fake their identifiers.
+        ;;
+        ;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
     ; Client launcher scripts and third-party clients make use of this to
@@ -256,6 +273,22 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; If you run this gatekeeper server behind a proxy, set this to true
     ; HasProxy = false
 
+        ;; Regular expressions for controlling which client versions are accepted/denied.
+        ;; An empty string means nothing is checked.
+        ;;
+        ;; Example 1: allow only these 3 types of clients (any version of them)
+        ;; AllowedClients = "Imprudence|Hippo|Second Life"
+        ;;
+        ;; Example 2: allow all clients except these
+        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+        ;;
+        ;; Note that these are regular expressions, so every character counts.
+        ;; Also note that this is very weak security and should not be trusted as a reliable means
+        ;; for keeping bad clients out; modified clients can fake their identifiers.
+        ;;
+        ;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
 
 [UserAgentService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 4d16236..047e9ee 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -13,7 +13,7 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -176,6 +176,23 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
 
+        ;; Regular expressions for controlling which client versions are accepted/denied.
+        ;; An empty string means nothing is checked.
+        ;;
+        ;; Example 1: allow only these 3 types of clients (any version of them)
+        ;; AllowedClients = "Imprudence|Hippo|Second Life"
+        ;;
+        ;; Example 2: allow all clients except these
+        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+        ;;
+        ;; Note that these are regular expressions, so every character counts.
+        ;; Also note that this is very weak security and should not be trusted as a reliable means
+        ;; for keeping bad clients out; modified clients can fake their identifiers.
+        ;;
+        ;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
     ; Client launcher scripts and third-party clients make use of this to
diff --git a/bin/Tools.dll b/bin/Tools.dll
index 08dcf42..08dcf42 100644..100755
--- a/bin/Tools.dll
+++ b/bin/Tools.dll
diff --git a/bin/Warp3D.dll b/bin/Warp3D.dll
index 8781a82..8781a82 100644..100755
--- a/bin/Warp3D.dll
+++ b/bin/Warp3D.dll
diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll
index 1559a73..1559a73 100644..100755
--- a/bin/XMLRPC.dll
+++ b/bin/XMLRPC.dll
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index dcebd63..67efa11 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -83,6 +83,23 @@
     SRV_AssetServerURI = "http://127.0.0.1:9000"
     SRV_ProfileServerURI = "http://127.0.0.1:9000"
 
+        ;; Regular expressions for controlling which client versions are accepted/denied.
+        ;; An empty string means nothing is checked.
+        ;;
+        ;; Example 1: allow only these 3 types of clients (any version of them)
+        ;; AllowedClients = "Imprudence|Hippo|Second Life"
+        ;;
+        ;; Example 2: allow all clients except these
+        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+        ;;
+        ;; Note that these are regular expressions, so every character counts.
+        ;; Also note that this is very weak security and should not be trusted as a reliable means
+        ;; for keeping bad clients out; modified clients can fake their identifiers.
+        ;;
+        ;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
 
@@ -90,6 +107,23 @@
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
     AllowTeleportsToAnyRegion = true
 
+        ;; Regular expressions for controlling which client versions are accepted/denied.
+        ;; An empty string means nothing is checked.
+        ;;
+        ;; Example 1: allow only these 3 types of clients (any version of them)
+        ;; AllowedClients = "Imprudence|Hippo|Second Life"
+        ;;
+        ;; Example 2: allow all clients except these
+        ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+        ;;
+        ;; Note that these are regular expressions, so every character counts.
+        ;; Also note that this is very weak security and should not be trusted as a reliable means
+        ;; for keeping bad clients out; modified clients can fake their identifiers.
+        ;;
+        ;;
+    ;AllowedClients = ""
+    ;DeniedClients = ""
+
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
     ; Client launcher scripts and third-party clients make use of this to
diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll
index 8ec7c55..8ec7c55 100644..100755
--- a/bin/libbulletnet.dll
+++ b/bin/libbulletnet.dll
diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll
index 16a1cfc..16a1cfc 100644..100755
--- a/bin/libdb_dotNET43.dll
+++ b/bin/libdb_dotNET43.dll
diff --git a/bin/log4net.dll b/bin/log4net.dll
index ffc57e1..ffc57e1 100644..100755
--- a/bin/log4net.dll
+++ b/bin/log4net.dll
diff --git a/bin/nunit.framework.dll b/bin/nunit.framework.dll
index 875e098..875e098 100644..100755
--- a/bin/nunit.framework.dll
+++ b/bin/nunit.framework.dll
diff --git a/bin/ode.dll b/bin/ode.dll
index f310358..f310358 100644..100755
--- a/bin/ode.dll
+++ b/bin/ode.dll
diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll
index 97729ff..97729ff 100644..100755
--- a/bin/openjpeg-dotnet-x86_64.dll
+++ b/bin/openjpeg-dotnet-x86_64.dll
diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll
index 64b2557..64b2557 100644..100755
--- a/bin/openjpeg-dotnet.dll
+++ b/bin/openjpeg-dotnet.dll
diff --git a/bin/protobuf-net.dll b/bin/protobuf-net.dll
deleted file mode 100644
index 057a411..0000000
--- a/bin/protobuf-net.dll
+++ /dev/null
diff --git a/bin/xunit.dll b/bin/xunit.dll
index a512735..a512735 100644..100755
--- a/bin/xunit.dll
+++ b/bin/xunit.dll
diff --git a/bin/zlib.net.dll b/bin/zlib.net.dll
index 9d15654..9d15654 100644..100755
--- a/bin/zlib.net.dll
+++ b/bin/zlib.net.dll