diff options
author | Diva Canto | 2012-09-20 19:50:57 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-20 19:50:57 -0700 |
commit | e379566e6e3bed0d7001f099a5ea8dfd648d76cf (patch) | |
tree | d3c9877c5b0e24e3d56b5ee1029324efd05beff6 /bin | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-e379566e6e3bed0d7001f099a5ea8dfd648d76cf.zip opensim-SC_OLD-e379566e6e3bed0d7001f099a5ea8dfd648d76cf.tar.gz opensim-SC_OLD-e379566e6e3bed0d7001f099a5ea8dfd648d76cf.tar.bz2 opensim-SC_OLD-e379566e6e3bed0d7001f099a5ea8dfd648d76cf.tar.xz |
Improvement over last commit: refactor the asset permissions code, so that it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Robust.HG.ini.example | 10 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 8218b14..399779d 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -437,15 +437,17 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
437 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 437 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
438 | HomeURI = "http://127.0.0.1:8002" | 438 | HomeURI = "http://127.0.0.1:8002" |
439 | 439 | ||
440 | ;; The asset types that other grids can get from / post to this service. | 440 | ;; The asset types that this service can export to / import from other grids. |
441 | ;; Comma separated. | ||
441 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | 442 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: |
442 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | 443 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, |
444 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | ||
443 | ;; | 445 | ;; |
444 | ;; Leave blank or commented if you don't want to apply any restrictions. | 446 | ;; Leave blank or commented if you don't want to apply any restrictions. |
445 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | 447 | ;; A more strict, but still reasonable, policy may be to disallow the exchange |
446 | ;; of scripts, like so: | 448 | ;; of scripts, like so: |
447 | ; DisallowGET ="LSLText" | 449 | ; DisallowExport ="LSLText" |
448 | ; DisallowPOST ="LSLBytecode" | 450 | ; DisallowImport ="LSLBytecode" |
449 | 451 | ||
450 | [HGFriendsService] | 452 | [HGFriendsService] |
451 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" | 453 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index d8ecba8..d5eb50d 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -53,15 +53,17 @@ | |||
53 | [HGAssetService] | 53 | [HGAssetService] |
54 | HomeURI = "http://127.0.0.1:9000" | 54 | HomeURI = "http://127.0.0.1:9000" |
55 | 55 | ||
56 | ;; The asset types that other grids can get from / post to this service. | 56 | ;; The asset types that this service can export to / import from other grids. |
57 | ;; Comma separated. | ||
57 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | 58 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: |
58 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | 59 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, |
60 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | ||
59 | ;; | 61 | ;; |
60 | ;; Leave blank or commented if you don't want to apply any restrictions. | 62 | ;; Leave blank or commented if you don't want to apply any restrictions. |
61 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | 63 | ;; A more strict, but still reasonable, policy may be to disallow the exchange |
62 | ;; of scripts, like so: | 64 | ;; of scripts, like so: |
63 | ; DisallowGET ="LSLText" | 65 | ; DisallowExport ="LSLText" |
64 | ; DisallowPOST ="LSLBytecode" | 66 | ; DisallowImport ="LSLBytecode" |
65 | 67 | ||
66 | 68 | ||
67 | [HGInventoryAccessModule] | 69 | [HGInventoryAccessModule] |