aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2014-05-07 17:00:12 -0700
committerDiva Canto2014-05-07 17:00:12 -0700
commitf4cba27105f68914de455cf6a27b9126e086cea1 (patch)
treed87599f942f1e839dc4262f18c946564528314be /bin
parentAllow Tools.Configger to take -inifile as argument (diff)
parentAdd GridUserService service config to [UserAccountService] in Robust[.HG].ini... (diff)
downloadopensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.zip
opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.gz
opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.bz2
opensim-SC_OLD-f4cba27105f68914de455cf6a27b9126e086cea1.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example11
-rw-r--r--bin/OpenSimDefaults.ini9
-rw-r--r--bin/Robust.HG.ini.example3
-rw-r--r--bin/Robust.ini.example1
4 files changed, 14 insertions, 10 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 8742313..7f2cba6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -204,11 +204,12 @@
204 ; meshing = ZeroMesher 204 ; meshing = ZeroMesher
205 205
206 ;; Choose one of the physics engines below 206 ;; Choose one of the physics engines below
207 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine 207 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim
208 ;; OpenDynamicsEngine is by some distance the most developed physics engine 208 ;; BulletSim is the default physics engine. It provides the best performance and most functionality.
209 ;; BulletSim is experimental and in active development. 209 ;; BulletSim supports varregions.
210 ;; basicphysics effectively does not model physics at all, making all 210 ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before.
211 ;; objects phantom. 211 ;; It continues to provide a workable physics implementation. It does not currently support varregions.
212 ;; basicphysics effectively does not model physics at all, making all objects phantom.
212 ;; Default is OpenDynamicsEngine 213 ;; Default is OpenDynamicsEngine
213 ; physics = OpenDynamicsEngine 214 ; physics = OpenDynamicsEngine
214 ; physics = BulletSim 215 ; physics = BulletSim
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index df332ca..cae2958 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -234,9 +234,12 @@
234 ; to false if you have compatibility problems. 234 ; to false if you have compatibility problems.
235 ;CacheSculptMaps = true 235 ;CacheSculptMaps = true
236 236
237 ; Choose one of the physics engines below. 237 ;; BulletSim is the default physics engine. It provides the best performance and most functionality.
238 ; BulletSim is a high performance physics engine. It is the default OpenSimulator physics engine 238 ;; BulletSim supports varregions.
239 ; OpenDynamicsEngine is another developed physics engine that was the previous default in OpenSimulator 0.7.6 and before 239 ;; OpenDynamicsEngine was the previous default physics engine in OpenSimulator 0.7.6.1 and before.
240 ;; It continues to provide a workable physics implementation. It does not currently support varregions.
241 ;; basicphysics effectively does not model physics at all, making all objects phantom.
242 ;; Default is OpenDynamicsEngine
240 physics = BulletSim 243 physics = BulletSim
241 ;physics = modified_BulletX 244 ;physics = modified_BulletX
242 ;physics = OpenDynamicsEngine 245 ;physics = OpenDynamicsEngine
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 14e9bff..e385200 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -163,8 +163,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
163[GridService] 163[GridService]
164 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 164 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
165 165
166 HypergridLinker = true
167
168 ; Realm = "regions" 166 ; Realm = "regions"
169 ; AllowDuplicateNames = "True" 167 ; AllowDuplicateNames = "True"
170 168
@@ -284,6 +282,7 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
284 GridService = "OpenSim.Services.GridService.dll:GridService" 282 GridService = "OpenSim.Services.GridService.dll:GridService"
285 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 283 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
286 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 284 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
285 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
287 286
288 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 287 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
289 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. 288 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 829e393..2f1a627 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -240,6 +240,7 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
240 GridService = "OpenSim.Services.GridService.dll:GridService" 240 GridService = "OpenSim.Services.GridService.dll:GridService"
241 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 241 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
242 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" 242 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
243 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
243 244
244 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 245 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
245 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. 246 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.