diff options
author | BlueWall | 2011-02-12 20:42:11 -0500 |
---|---|---|
committer | BlueWall | 2011-02-12 20:42:11 -0500 |
commit | c0e1742d479d4390701688da685892555f28bfbc (patch) | |
tree | 39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /bin/config-include | |
parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
parent | Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff) | |
download | opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.zip opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.gz opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2 opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.xz |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'bin/config-include')
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 4 | ||||
-rw-r--r-- | bin/config-include/HyperSimianGrid.ini | 11 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 4 |
3 files changed, 19 insertions, 0 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 761e5eb..e1bcf00 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -88,6 +88,10 @@ | |||
88 | ; accessible from other grids | 88 | ; accessible from other grids |
89 | ; | 89 | ; |
90 | ProfileServerURI = "http://mygridserver.com:8002/user" | 90 | ProfileServerURI = "http://mygridserver.com:8002/user" |
91 | ;; If you want to protect your assets from being copied by foreign visitors | ||
92 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
93 | ; OutboundPermission = False | ||
94 | |||
91 | 95 | ||
92 | [Modules] | 96 | [Modules] |
93 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 97 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. |
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 0b01116..89d6be7 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini | |||
@@ -82,3 +82,14 @@ | |||
82 | 82 | ||
83 | [Profiles] | 83 | [Profiles] |
84 | Module = "SimianProfiles" | 84 | Module = "SimianProfiles" |
85 | |||
86 | [HGInventoryAccessModule] | ||
87 | ; | ||
88 | ; === HG ONLY === | ||
89 | ; Change this to your profile server | ||
90 | ; accessible from other grids | ||
91 | ; | ||
92 | ProfileServerURI = "http://mygridserver.com:8002/user" | ||
93 | ;; If you want to protect your assets from being copied by foreign visitors | ||
94 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
95 | ; OutboundPermission = False | ||
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 4956bc3..213219c 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -33,6 +33,10 @@ | |||
33 | 33 | ||
34 | [HGInventoryAccessModule] | 34 | [HGInventoryAccessModule] |
35 | ProfileServerURI = "http://127.0.0.1:9000/profiles" | 35 | ProfileServerURI = "http://127.0.0.1:9000/profiles" |
36 | ;; If you want to protect your assets from being copied by foreign visitors | ||
37 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
38 | ; OutboundPermission = False | ||
39 | |||
36 | 40 | ||
37 | [Modules] | 41 | [Modules] |
38 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. | 42 | ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. |