From e0002f6b64e7aeb29de9f1db92ed39d3d1df578c Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 21 Apr 2011 19:04:41 -0400 Subject: some mesh config asthetics --- bin/OpenSimDefaults.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index b134b7e..7ea98d4 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -453,7 +453,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 -- cgit v1.1 From 44e43d9d240735695668849fbd7aaafd339f262d Mon Sep 17 00:00:00 2001 From: E. Allen Soard Date: Fri, 15 Apr 2011 06:17:26 -0700 Subject: Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources. --- bin/RegionConfig.ini.example | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') 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 -- cgit v1.1 From 35c09cae8c572c3b0dcc4b680dfe908d1253e8a9 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 24 Apr 2011 19:06:48 -0700 Subject: Removed unused libraries Castle.* --- bin/Castle.Core.dll | Bin 73728 -> 0 bytes bin/Castle.DynamicProxy.dll | Bin 63488 -> 0 bytes bin/Castle.DynamicProxy2.dll | Bin 106496 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/Castle.Core.dll delete mode 100644 bin/Castle.DynamicProxy.dll delete mode 100644 bin/Castle.DynamicProxy2.dll (limited to 'bin') diff --git a/bin/Castle.Core.dll b/bin/Castle.Core.dll deleted file mode 100644 index 2464e66..0000000 Binary files a/bin/Castle.Core.dll and /dev/null differ diff --git a/bin/Castle.DynamicProxy.dll b/bin/Castle.DynamicProxy.dll deleted file mode 100644 index 8540495..0000000 Binary files a/bin/Castle.DynamicProxy.dll and /dev/null differ diff --git a/bin/Castle.DynamicProxy2.dll b/bin/Castle.DynamicProxy2.dll deleted file mode 100644 index 83e192e..0000000 Binary files a/bin/Castle.DynamicProxy2.dll and /dev/null differ -- cgit v1.1 From 0d5a80ad784993a4c737590cafa0303930d00a86 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 24 Apr 2011 19:14:39 -0700 Subject: Removed unused libraries: RAILS.dll and dependencies. --- bin/DotSets.dll | Bin 24576 -> 0 bytes bin/Mono.PEToolkit.dll | Bin 131072 -> 0 bytes bin/RAIL.dll | Bin 200704 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/DotSets.dll delete mode 100644 bin/Mono.PEToolkit.dll delete mode 100644 bin/RAIL.dll (limited to 'bin') diff --git a/bin/DotSets.dll b/bin/DotSets.dll deleted file mode 100644 index 5225651..0000000 Binary files a/bin/DotSets.dll and /dev/null differ diff --git a/bin/Mono.PEToolkit.dll b/bin/Mono.PEToolkit.dll deleted file mode 100644 index b4c3e70..0000000 Binary files a/bin/Mono.PEToolkit.dll and /dev/null differ diff --git a/bin/RAIL.dll b/bin/RAIL.dll deleted file mode 100644 index f2632d7..0000000 Binary files a/bin/RAIL.dll and /dev/null differ -- cgit v1.1 From 024c12abc3aa42432e55e322141cad1edeb5bad1 Mon Sep 17 00:00:00 2001 From: Mic Bowman Date: Mon, 25 Apr 2011 10:44:41 -0700 Subject: Cleaned up various configuration options. Removed the category throttle limits because the only ones used now are the defaults (which are overwritten by the client throttles anyway). Updated the default rates to correspond to about 350kbps. Also added a configuration to disable adaptive throttle. The default is the previous behavior (no adaptation). --- bin/OpenSimDefaults.ini | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 7ea98d4..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 -- cgit v1.1 From e579a990b4466fcecc11a9b8c6ad74cc70530e5c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 25 Apr 2011 18:59:01 -0700 Subject: Removed stale client components: MXP and VWoHTTP. --- bin/MXP.dll | Bin 114688 -> 0 bytes bin/protobuf-net.dll | Bin 107008 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/MXP.dll delete mode 100644 bin/protobuf-net.dll (limited to 'bin') diff --git a/bin/MXP.dll b/bin/MXP.dll deleted file mode 100644 index 99e90c8..0000000 Binary files a/bin/MXP.dll and /dev/null differ diff --git a/bin/protobuf-net.dll b/bin/protobuf-net.dll deleted file mode 100644 index 057a411..0000000 Binary files a/bin/protobuf-net.dll and /dev/null differ -- cgit v1.1 From d722f22102f1f7ca618cc220e79c5f2097f84a32 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 27 Apr 2011 01:53:57 +0100 Subject: adjust freeswitch grid connector to port 8003 to agree with the default 8003 used in OpenSim.ini.example Adjusting to 8003 seems sensible since this service doesn't need to be exposed to viewers. --- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index e2e9624..daeb068 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -21,7 +21,7 @@ ; * [[@]/][:] ; * [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,8003/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 diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 4d16236..9c391ea 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -13,7 +13,7 @@ ; * [[@]/][:] ; * [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,8003/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 -- cgit v1.1 From 1b43c05c3d8444faca0126bf195df0b0d99b6e83 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 27 Apr 2011 02:05:16 +0100 Subject: Change default ini.example port used by Freeswitch in grid settings to 8004. This is to facilitate running Freeswitch in a separate ROBUST shell, as on grid setups there can be quite a lot of traffic flowing between FreeSWITCH and ROBUST. However, running in a spearate shell is not mandatory. --- bin/OpenSim.ini.example | 2 +- bin/Robust.HG.ini.example | 2 +- bin/Robust.ini.example | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') 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/Robust.HG.ini.example b/bin/Robust.HG.ini.example index daeb068..f2f2a66 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -21,7 +21,7 @@ ; * [[@]/][:] ; * [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8003/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 diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 9c391ea..aef0596 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -13,7 +13,7 @@ ; * [[@]/][:] ; * [Startup] -ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8003/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 -- cgit v1.1 From e0576b56d376d6bc7b9c5c3818acbdbcdb0dc56f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 27 Apr 2011 07:02:37 -0700 Subject: Thank you Snoopy for a patch that adds some filtering to client versions allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. --- bin/Robust.HG.ini.example | 33 ++++++++++++++++++++++++ bin/Robust.ini.example | 17 +++++++++++++ bin/config-include/StandaloneCommon.ini.example | 34 +++++++++++++++++++++++++ 3 files changed, 84 insertions(+) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index f2f2a66..572497c 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -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 aef0596..047e9ee 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -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/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 -- cgit v1.1 From 5e3893ca5c8c985bf9b2a1e1dbc94d48a4eb3e96 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 27 Apr 2011 23:57:26 +0100 Subject: add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows Mono doesn't care if the --- bin/Axiom.MathLib.dll | Bin bin/BulletDotNET.dll | Bin bin/C5.dll | Bin bin/CSJ2K.dll | Bin bin/Community.CsharpSqlite.Sqlite.dll | Bin bin/Community.CsharpSqlite.dll | Bin bin/CookComputing.XmlRpcV2.dll | Bin bin/DotNetOpenId.dll | Bin bin/DotNetOpenMail.dll | Bin bin/Fadd.Globalization.Yaml.dll | Bin bin/Fadd.dll | Bin bin/GlynnTucker.Cache.dll | Bin bin/Google.ProtocolBuffers.dll | Bin bin/HttpServer.dll | Bin bin/HttpServer_OpenSim.dll | Bin bin/Iesi.Collections.dll | Bin bin/Kds.Serialization.dll | Bin bin/Modified.XnaDevRu.BulletX.dll | Bin bin/Mono.Addins.CecilReflector.dll | Bin bin/Mono.Addins.Setup.dll | Bin bin/Mono.Addins.dll | Bin bin/Mono.Data.Sqlite.dll | Bin bin/Mono.Data.SqliteClient.dll | Bin bin/MonoXnaCompactMaths.dll | Bin bin/MySql.Data.dll | Bin bin/NDesk.Options.dll | Bin bin/Newtonsoft.Json.Net20.dll | Bin bin/Nini.dll | Bin bin/Npgsql.dll | Bin bin/Ode.NET.dll | Bin bin/OpenMetaverse.StructuredData.dll | Bin bin/OpenMetaverse.dll | Bin bin/OpenMetaverseTypes.dll | Bin bin/PhysX-wrapper.dll | Bin bin/PhysX_Wrapper_Dotnet.dll | Bin bin/PrimMesher.dll | Bin bin/PumaCode.SvnDotNet.dll | Bin bin/Tools.dll | Bin bin/Warp3D.dll | Bin bin/XMLRPC.dll | Bin bin/libbulletnet.dll | Bin bin/libdb_dotNET43.dll | Bin bin/log4net.dll | Bin bin/nunit.framework.dll | Bin bin/ode.dll | Bin bin/openjpeg-dotnet-x86_64.dll | Bin bin/openjpeg-dotnet.dll | Bin bin/xunit.dll | Bin bin/zlib.net.dll | Bin 49 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/Axiom.MathLib.dll mode change 100644 => 100755 bin/BulletDotNET.dll mode change 100644 => 100755 bin/C5.dll mode change 100644 => 100755 bin/CSJ2K.dll mode change 100644 => 100755 bin/Community.CsharpSqlite.Sqlite.dll mode change 100644 => 100755 bin/Community.CsharpSqlite.dll mode change 100644 => 100755 bin/CookComputing.XmlRpcV2.dll mode change 100644 => 100755 bin/DotNetOpenId.dll mode change 100644 => 100755 bin/DotNetOpenMail.dll mode change 100644 => 100755 bin/Fadd.Globalization.Yaml.dll mode change 100644 => 100755 bin/Fadd.dll mode change 100644 => 100755 bin/GlynnTucker.Cache.dll mode change 100644 => 100755 bin/Google.ProtocolBuffers.dll mode change 100644 => 100755 bin/HttpServer.dll mode change 100644 => 100755 bin/HttpServer_OpenSim.dll mode change 100644 => 100755 bin/Iesi.Collections.dll mode change 100644 => 100755 bin/Kds.Serialization.dll mode change 100644 => 100755 bin/Modified.XnaDevRu.BulletX.dll mode change 100644 => 100755 bin/Mono.Addins.CecilReflector.dll mode change 100644 => 100755 bin/Mono.Addins.Setup.dll mode change 100644 => 100755 bin/Mono.Addins.dll mode change 100644 => 100755 bin/Mono.Data.Sqlite.dll mode change 100644 => 100755 bin/Mono.Data.SqliteClient.dll mode change 100644 => 100755 bin/MonoXnaCompactMaths.dll mode change 100644 => 100755 bin/MySql.Data.dll mode change 100644 => 100755 bin/NDesk.Options.dll mode change 100644 => 100755 bin/Newtonsoft.Json.Net20.dll mode change 100644 => 100755 bin/Nini.dll mode change 100644 => 100755 bin/Npgsql.dll mode change 100644 => 100755 bin/Ode.NET.dll mode change 100644 => 100755 bin/OpenMetaverse.StructuredData.dll mode change 100644 => 100755 bin/OpenMetaverse.dll mode change 100644 => 100755 bin/OpenMetaverseTypes.dll mode change 100644 => 100755 bin/PhysX-wrapper.dll mode change 100644 => 100755 bin/PhysX_Wrapper_Dotnet.dll mode change 100644 => 100755 bin/PrimMesher.dll mode change 100644 => 100755 bin/PumaCode.SvnDotNet.dll mode change 100644 => 100755 bin/Tools.dll mode change 100644 => 100755 bin/Warp3D.dll mode change 100644 => 100755 bin/XMLRPC.dll mode change 100644 => 100755 bin/libbulletnet.dll mode change 100644 => 100755 bin/libdb_dotNET43.dll mode change 100644 => 100755 bin/log4net.dll mode change 100644 => 100755 bin/nunit.framework.dll mode change 100644 => 100755 bin/ode.dll mode change 100644 => 100755 bin/openjpeg-dotnet-x86_64.dll mode change 100644 => 100755 bin/openjpeg-dotnet.dll mode change 100644 => 100755 bin/xunit.dll mode change 100644 => 100755 bin/zlib.net.dll (limited to 'bin') diff --git a/bin/Axiom.MathLib.dll b/bin/Axiom.MathLib.dll old mode 100644 new mode 100755 diff --git a/bin/BulletDotNET.dll b/bin/BulletDotNET.dll old mode 100644 new mode 100755 diff --git a/bin/C5.dll b/bin/C5.dll old mode 100644 new mode 100755 diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll old mode 100644 new mode 100755 diff --git a/bin/Community.CsharpSqlite.Sqlite.dll b/bin/Community.CsharpSqlite.Sqlite.dll old mode 100644 new mode 100755 diff --git a/bin/Community.CsharpSqlite.dll b/bin/Community.CsharpSqlite.dll old mode 100644 new mode 100755 diff --git a/bin/CookComputing.XmlRpcV2.dll b/bin/CookComputing.XmlRpcV2.dll old mode 100644 new mode 100755 diff --git a/bin/DotNetOpenId.dll b/bin/DotNetOpenId.dll old mode 100644 new mode 100755 diff --git a/bin/DotNetOpenMail.dll b/bin/DotNetOpenMail.dll old mode 100644 new mode 100755 diff --git a/bin/Fadd.Globalization.Yaml.dll b/bin/Fadd.Globalization.Yaml.dll old mode 100644 new mode 100755 diff --git a/bin/Fadd.dll b/bin/Fadd.dll old mode 100644 new mode 100755 diff --git a/bin/GlynnTucker.Cache.dll b/bin/GlynnTucker.Cache.dll old mode 100644 new mode 100755 diff --git a/bin/Google.ProtocolBuffers.dll b/bin/Google.ProtocolBuffers.dll old mode 100644 new mode 100755 diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll old mode 100644 new mode 100755 diff --git a/bin/HttpServer_OpenSim.dll b/bin/HttpServer_OpenSim.dll old mode 100644 new mode 100755 diff --git a/bin/Iesi.Collections.dll b/bin/Iesi.Collections.dll old mode 100644 new mode 100755 diff --git a/bin/Kds.Serialization.dll b/bin/Kds.Serialization.dll old mode 100644 new mode 100755 diff --git a/bin/Modified.XnaDevRu.BulletX.dll b/bin/Modified.XnaDevRu.BulletX.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Data.Sqlite.dll b/bin/Mono.Data.Sqlite.dll old mode 100644 new mode 100755 diff --git a/bin/Mono.Data.SqliteClient.dll b/bin/Mono.Data.SqliteClient.dll old mode 100644 new mode 100755 diff --git a/bin/MonoXnaCompactMaths.dll b/bin/MonoXnaCompactMaths.dll old mode 100644 new mode 100755 diff --git a/bin/MySql.Data.dll b/bin/MySql.Data.dll old mode 100644 new mode 100755 diff --git a/bin/NDesk.Options.dll b/bin/NDesk.Options.dll old mode 100644 new mode 100755 diff --git a/bin/Newtonsoft.Json.Net20.dll b/bin/Newtonsoft.Json.Net20.dll old mode 100644 new mode 100755 diff --git a/bin/Nini.dll b/bin/Nini.dll old mode 100644 new mode 100755 diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll old mode 100644 new mode 100755 diff --git a/bin/Ode.NET.dll b/bin/Ode.NET.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll old mode 100644 new mode 100755 diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll old mode 100644 new mode 100755 diff --git a/bin/PhysX-wrapper.dll b/bin/PhysX-wrapper.dll old mode 100644 new mode 100755 diff --git a/bin/PhysX_Wrapper_Dotnet.dll b/bin/PhysX_Wrapper_Dotnet.dll old mode 100644 new mode 100755 diff --git a/bin/PrimMesher.dll b/bin/PrimMesher.dll old mode 100644 new mode 100755 diff --git a/bin/PumaCode.SvnDotNet.dll b/bin/PumaCode.SvnDotNet.dll old mode 100644 new mode 100755 diff --git a/bin/Tools.dll b/bin/Tools.dll old mode 100644 new mode 100755 diff --git a/bin/Warp3D.dll b/bin/Warp3D.dll old mode 100644 new mode 100755 diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll old mode 100644 new mode 100755 diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll old mode 100644 new mode 100755 diff --git a/bin/libdb_dotNET43.dll b/bin/libdb_dotNET43.dll old mode 100644 new mode 100755 diff --git a/bin/log4net.dll b/bin/log4net.dll old mode 100644 new mode 100755 diff --git a/bin/nunit.framework.dll b/bin/nunit.framework.dll old mode 100644 new mode 100755 diff --git a/bin/ode.dll b/bin/ode.dll old mode 100644 new mode 100755 diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll old mode 100644 new mode 100755 diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll old mode 100644 new mode 100755 diff --git a/bin/xunit.dll b/bin/xunit.dll old mode 100644 new mode 100755 diff --git a/bin/zlib.net.dll b/bin/zlib.net.dll old mode 100644 new mode 100755 -- cgit v1.1