aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2013-06-04 21:09:25 +0100
committerMelanie2013-06-04 21:09:25 +0100
commit648e258b8e79e52df18f41f2ec79016a095f7766 (patch)
treede96993d11a0183ac026cec61e0e5a937f801c3c /bin
parentMerge branch 'master' into careminster (diff)
parentNew HttpServer_OpenSim.dll with increased limits on number of connections, re... (diff)
downloadopensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.zip
opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.gz
opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.bz2
opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
Diffstat (limited to 'bin')
-rwxr-xr-xbin/HttpServer_OpenSim.dllbin119808 -> 116224 bytes
-rw-r--r--bin/OpenSim.ini.example6
-rw-r--r--bin/OpenSimDefaults.ini70
-rw-r--r--bin/Robust.HG.ini.example12
-rw-r--r--bin/Robust.ini.example11
-rw-r--r--bin/config-include/StandaloneCommon.ini.example16
-rw-r--r--bin/config-include/StandaloneHypergrid.ini2
7 files changed, 83 insertions, 34 deletions
diff --git a/bin/HttpServer_OpenSim.dll b/bin/HttpServer_OpenSim.dll
index e15493d..38a4cb7 100755
--- a/bin/HttpServer_OpenSim.dll
+++ b/bin/HttpServer_OpenSim.dll
Binary files differ
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index edd22aa..1ea4609 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1028,6 +1028,12 @@
1028 ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island 1028 ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
1029 ; InitialTerrain = "pinhead-island" 1029 ; InitialTerrain = "pinhead-island"
1030 1030
1031[UserProfiles]
1032 ;# {ProfileURL} {} {Set url to UserProfilesService} {}
1033 ;; Set the value of the url to your UserProfilesService
1034 ;; If un-set / "" the module is disabled
1035 ;; ProfileServiceURL = http://127.0.0.1:8002
1036
1031[Architecture] 1037[Architecture]
1032 ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini 1038 ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
1033 ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim, 1039 ;; Uncomment one of the following includes as required. For instance, to create a standalone OpenSim,
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a5a43b1..3a961d6 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -373,6 +373,19 @@
373 AllowRegionRestartFromClient = true 373 AllowRegionRestartFromClient = true
374 374
375 375
376[UserProfiles]
377 ;# {ProfileURL} {} {Set url to UserProfilesService} {}
378 ;; Set the value of the url to your UserProfilesService
379 ;; If un-set / "" the module is disabled
380 ;; If the ProfileURL is not set, then very BASIC
381 ;; profile support will be configured. If the ProfileURL is set to a
382 ;; valid URL, then full profile support will be configured. The URL
383 ;; points to your grid's Robust user profiles service
384 ;;
385 ; ProfileURL = http://127.0.0.1:9000
386
387
388
376[SMTP] 389[SMTP]
377 enabled = false 390 enabled = false
378 391
@@ -917,56 +930,49 @@
917 ;force_simple_prim_meshing = true 930 ;force_simple_prim_meshing = true
918 931
919[BulletSim] 932[BulletSim]
920 ; World parameters 933 ; All the BulletSim parameters can be displayed with the console command "physics get all"
934 ; and all are defined in the source file OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
921 935
922 ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll 936 ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
923 ; bulletxna is a managed C# dll. They have comparible functionality.. the c++ is much faster. 937 ; bulletxna is a managed C# dll. They have comparible functionality but the c++ one is much faster.
924
925 BulletEngine = "bulletunmanaged" 938 BulletEngine = "bulletunmanaged"
926 ; BulletEngine = "bulletxna" 939 ; BulletEngine = "bulletxna"
927 940
928 ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain. If you're using the bulletxna engine, 941 ; Terrain Implementation
929 ; you will want to switch to the heightfield option 942 TerrainImplementation = 1 ; 0=Heightfield, 1=mesh
930 TerrainImplementation = 1 943 ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield resolution). '2'
931 ; TerrainImplementation = 0 944 ; gives 512x512. Etc. Cannot be larger than '4'. Higher magnification uses lots of memory.
932 945 TerrainMeshMagnification = 2
933 Gravity = -9.80665
934 946
935 TerrainFriction = 0.30 947 ; Avatar physics height adjustments. http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
936 TerrainHitFraction = 0.8 948 AvatarHeightLowFudge = -0.2 ; Adjustment at low end of height range
937 TerrainRestitution = 0 949 AvatarHeightMidFudge = 0.1 ; Adjustment at mid point of avatar height range
938 TerrainCollisionMargin = 0.04 950 AvatarHeightHighFudge = 0.1 ; Adjustment at high end of height range
939 951
940 AvatarFriction = 0.2 952 ; Default linkset implmentation
941 AvatarStandingFriction = 0.95 953 ; 'Constraint' uses physics constraints to hold linkset together. 'Compound' builds a compound
942 AvatarRestitution = 0.0 954 ; shape from the children shapes to create a single physical shape. 'Compound' uses a lot less CPU time.
943 AvatarDensity = 3.5
944 AvatarCapsuleWidth = 0.6
945 AvatarCapsuleDepth = 0.45
946 AvatarCapsuleHeight = 1.5
947 AvatarContactProcessingThreshold = 0.1
948
949 MaxObjectMass = 10000.01
950
951 CollisionMargin = 0.04
952
953 ; Linkset implmentation
954 LinkImplementation = 1 ; 0=constraint, 1=compound 955 LinkImplementation = 1 ; 0=constraint, 1=compound
955 956
956 ; Whether to mesh sculpties 957 ; If 'true', turn scuplties into meshes
957 MeshSculptedPrim = true 958 MeshSculptedPrim = true
958 959
959 ; If 'true', force simple prims (box and sphere) to be meshed 960 ; If 'true', force simple prims (box and sphere) to be meshed
961 ; If 'false', the Bullet native special case shape is used for square rectangles and even dimensioned spheres
960 ForceSimplePrimMeshing = false 962 ForceSimplePrimMeshing = false
961 963
962 ; Bullet step parameters 964 ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
963 MaxSubSteps = 10 965 ; Happens often in sculpties. If turned off, there will be some doorways that cannot be walked through.
964 FixedTimeStep = .01667 966 ShouldRemoveZeroWidthTriangles = true
967
968 ; If 'true', use convex hull definition in mesh asset if present.
969 ShouldUseAssetHulls = true
965 970
971 ; If there are thousands of physical objects, these maximums should be increased.
966 MaxCollisionsPerFrame = 2048 972 MaxCollisionsPerFrame = 2048
967 MaxUpdatesPerFrame = 8192 973 MaxUpdatesPerFrame = 8192
968 974
969 ; Detailed physics debug logging 975 ; Detailed physics debug logging. Very verbose.
970 PhysicsLoggingEnabled = False 976 PhysicsLoggingEnabled = False
971 PhysicsLoggingDir = "." 977 PhysicsLoggingDir = "."
972 VehicleLoggingEnabled = False 978 VehicleLoggingEnabled = False
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index bc2b4cf..d9f1ca1 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -71,10 +71,12 @@ HGInventoryServiceConnector = "HGInventoryService@8002/OpenSim.Server.Handlers.d
71HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector" 71HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
72;; Uncomment this if you want Groups V2, HG to work 72;; Uncomment this if you want Groups V2, HG to work
73; HGGroupsServiceConnector = "8002/OpenSim.Addons.Groups.dll:HGGroupsServiceRobustConnector" 73; HGGroupsServiceConnector = "8002/OpenSim.Addons.Groups.dll:HGGroupsServiceRobustConnector"
74
75;; Additions for other add-on modules. For example: 74;; Additions for other add-on modules. For example:
76;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector" 75;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
77 76
77;; Uncomment for UserProfiles see [UserProfilesService] to configure...
78; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
79
78; * This is common for all services, it's the network setup for the entire 80; * This is common for all services, it's the network setup for the entire
79; * server instance, if none is specified above 81; * server instance, if none is specified above
80; * 82; *
@@ -595,4 +597,12 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
595 ;; Can overwrite the default in [Hypergrid], but probably shouldn't 597 ;; Can overwrite the default in [Hypergrid], but probably shouldn't
596 ; HomeURI = "http://127.0.0.1:8002" 598 ; HomeURI = "http://127.0.0.1:8002"
597 599
600[UserProfilesService]
601 LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
602 Enabled = false
603 ;; Configure this for separate profiles database
604 ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
605 ;; Realm = UserProfiles
606 UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
607 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
598 608
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 1d66b7f..7d6492b 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -51,6 +51,8 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
51;; Uncomment this if you want Groups V2 to work 51;; Uncomment this if you want Groups V2 to work
52;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector" 52;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
53 53
54;; Uncomment for UserProfiles see [UserProfilesService] to configure...
55; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
54 56
55; * This is common for all services, it's the network setup for the entire 57; * This is common for all services, it's the network setup for the entire
56; * server instance, if none is specified above 58; * server instance, if none is specified above
@@ -391,4 +393,13 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
391 ; password help: optional: page providing password assistance for users of your grid 393 ; password help: optional: page providing password assistance for users of your grid
392 ;password = http://127.0.0.1/password 394 ;password = http://127.0.0.1/password
393 395
396[UserProfilesService]
397 LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
398 Enabled = false
399 ;; Configure this for separate profiles database
400 ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
401 ;; Realm = UserProfiles
402 UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
403 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
404
394 405
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 2547244..8c23c41 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -352,3 +352,19 @@
352 ;; If appearance is restricted, which accounts' appearances are allowed to be exported? 352 ;; If appearance is restricted, which accounts' appearances are allowed to be exported?
353 ;; Comma-separated list of account names 353 ;; Comma-separated list of account names
354 AccountForAppearance = "Test User, Astronaut Smith" 354 AccountForAppearance = "Test User, Astronaut Smith"
355
356;; UserProfiles Service
357;;
358;; To use, set Enabled to true then configure for your site...
359[UserProfilesService]
360 LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
361 Enabled = false
362
363 ;; Configure this for separate databse
364 ; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
365 ; Realm = UserProfiles
366
367 UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
368 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
369
370
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index ba92030..39c33e8 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,6 +19,7 @@
19 GridUserServices = "LocalGridUserServicesConnector" 19 GridUserServices = "LocalGridUserServicesConnector"
20 SimulationServices = "RemoteSimulationConnectorModule" 20 SimulationServices = "RemoteSimulationConnectorModule"
21 AvatarServices = "LocalAvatarServicesConnector" 21 AvatarServices = "LocalAvatarServicesConnector"
22 UserProfilesServices = "LocalUserProfilesServicesConnector"
22 MapImageService = "MapImageServiceModule" 23 MapImageService = "MapImageServiceModule"
23 EntityTransferModule = "HGEntityTransferModule" 24 EntityTransferModule = "HGEntityTransferModule"
24 InventoryAccessModule = "HGInventoryAccessModule" 25 InventoryAccessModule = "HGInventoryAccessModule"
@@ -184,7 +185,6 @@
184 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 185 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
185 InGatekeeper = True 186 InGatekeeper = True
186 187
187
188;; This should always be the very last thing on this file 188;; This should always be the very last thing on this file
189[Includes] 189[Includes]
190 Include-Common = "config-include/StandaloneCommon.ini" 190 Include-Common = "config-include/StandaloneCommon.ini"