From 223c90c7510e9dcf0bbf15535dbd6e9e9d2cfa96 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Apr 2011 19:31:37 +0100 Subject: Remove duplicated freeswitch settings. --- bin/Robust.HG.ini.example | 4 ---- 1 file changed, 4 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index ced2857..e2e9624 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -117,10 +117,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; EchoPort = 50505 ; AttemptSTUN = false - LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" - ;; IP of your FS server - ; ServerAddress = 127.0.0.1 - ; * This is the new style authentication service. Currently, only MySQL ; * is implemented. ; * -- cgit v1.1 From d9055c8dc3f5a768b300aa72318c813bbc024e09 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 21 Apr 2011 15:12:52 -0400 Subject: Group collada meshies settings under [Mesh] in OpensimDefaults.ini --- bin/OpenSimDefaults.ini | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e72e851..b134b7e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -149,12 +149,6 @@ ; to false if you have compatibility problems. ;CacheSculptMaps = 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 - ; mesh, and use it for collisions. This is currently experimental code and enabling - ; it may cause unexpected physics problems. - ;UseMeshiesPhysicsMesh = false - ; Choose one of the physics engines below ; OpenDynamicsEngine is by some distance the most developed physics engine ; basicphysics effectively does not model physics at all, making all objects phantom @@ -461,6 +455,12 @@ ; default is true ; ColladaMesh = 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 + ; mesh, and use it for collisions. This is currently experimental code and enabling + ; it may cause unexpected physics problems. + ;UseMeshiesPhysicsMesh = false + [ODEPhysicsSettings] ;## -- cgit v1.1 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