aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-02 19:31:23 +0000
committerMelanie Thielker2017-01-02 19:31:23 +0000
commit65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5 (patch)
tree4e7b0bd4c8d7e3991b5615ebd7433cd1ce5cbd33 /bin
parentAdd the HGRemoteAssetService. Allows to use any asset service with HG (diff)
parentCreate a generic way for passing constructor args to plugins (diff)
downloadopensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.zip
opensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.tar.gz
opensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.tar.bz2
opensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.tar.xz
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/Robust.HG.ini.example5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 20c0804..7d13d43 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -488,8 +488,9 @@
488 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 488 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
489 489
490 ; This inventory service will be used to initialize the user's inventory 490 ; This inventory service will be used to initialize the user's inventory
491 HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService" 491 HGInventoryServicePlugin = "HGInventoryService@OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
492 HGInventoryServiceConstructorArg = "HGInventoryService" 492 ; NOTE: HGInventoryServiceConstructorArg is deprecated. For now it will work, but see above
493 ; for the correct method if passing additional arguments.
493 ;; end hypergrid 494 ;; end hypergrid
494 495
495 ; Ask co-operative viewers to use a different currency name 496 ; Ask co-operative viewers to use a different currency name