aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorBlueWall2013-06-11 20:38:54 -0400
committerBlueWall2013-06-11 20:38:54 -0400
commit9f8a8f37194938670003512bde1ea38917bfc490 (patch)
treec6dab56ae46448d5357cea729708adb1f715fe3a /bin
parentAdd TriggerScenePresenceUpdated events when an animation is added (diff)
parentAdd option to set minimum fee for classified ads (diff)
downloadopensim-SC-9f8a8f37194938670003512bde1ea38917bfc490.zip
opensim-SC-9f8a8f37194938670003512bde1ea38917bfc490.tar.gz
opensim-SC-9f8a8f37194938670003512bde1ea38917bfc490.tar.bz2
opensim-SC-9f8a8f37194938670003512bde1ea38917bfc490.tar.xz
Merge working repo
Diffstat (limited to '')
-rw-r--r--bin/Robust.HG.ini.example8
-rw-r--r--bin/Robust.ini.example6
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
3 files changed, 16 insertions, 1 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d9f1ca1..2afb978 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -1,4 +1,4 @@
1; * Run 1i * Run
2; * $ Robust.exe -inifile Robust.HG.ini 2; * $ Robust.exe -inifile Robust.HG.ini
3; * 3; *
4 4
@@ -311,6 +311,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
311 ;; Ask co-operative viewers to use a different currency name 311 ;; Ask co-operative viewers to use a different currency name
312 ;Currency = "" 312 ;Currency = ""
313 313
314 ;; Minimum fee for creation of classified
315 ; ClassifiedFee = 0
316
314 WelcomeMessage = "Welcome, Avatar!" 317 WelcomeMessage = "Welcome, Avatar!"
315 AllowRemoteSetLoginLevel = "false" 318 AllowRemoteSetLoginLevel = "false"
316 319
@@ -436,6 +439,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
436 ; this is the entry point for all user-related HG services 439 ; this is the entry point for all user-related HG services
437 ; uas = http://127.0.0.1:8002/ 440 ; uas = http://127.0.0.1:8002/
438 441
442 ;; Minimum fee to publish classified add
443 ; ClassifiedFee = 0
444
439[GatekeeperService] 445[GatekeeperService]
440 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 446 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
441 ;; for the service 447 ;; for the service
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7d6492b..3440191 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -274,6 +274,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
274 ; Ask co-operative viewers to use a different currency name 274 ; Ask co-operative viewers to use a different currency name
275 ;Currency = "" 275 ;Currency = ""
276 276
277 ;; Minimum fee for creation of classified
278 ; ClassifiedFee = 0
279
277 WelcomeMessage = "Welcome, Avatar!" 280 WelcomeMessage = "Welcome, Avatar!"
278 AllowRemoteSetLoginLevel = "false" 281 AllowRemoteSetLoginLevel = "false"
279 282
@@ -393,6 +396,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
393 ; password help: optional: page providing password assistance for users of your grid 396 ; password help: optional: page providing password assistance for users of your grid
394 ;password = http://127.0.0.1/password 397 ;password = http://127.0.0.1/password
395 398
399 ;; Minimum fee to publish classified add
400 ; ClassifiedFee = 0
401
396[UserProfilesService] 402[UserProfilesService]
397 LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService" 403 LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
398 Enabled = false 404 Enabled = false
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8c23c41..8ec3daf 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -222,6 +222,9 @@
222 ; this is the entry point for all user-related HG services 222 ; this is the entry point for all user-related HG services
223 ; uas = http://127.0.0.1:9000/ 223 ; uas = http://127.0.0.1:9000/
224 224
225 ;; Minimum fee to publish classified add
226 ; ClassifiedFee = 0
227
225[MapImageService] 228[MapImageService]
226 ; Set this if you want to change the default 229 ; Set this if you want to change the default
227 ; TilesStoragePath = "maptiles" 230 ; TilesStoragePath = "maptiles"