diff options
| author | Melanie | 2011-02-07 22:08:53 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-07 22:08:53 +0000 |
| commit | 3889e68c5441218a2ffeb2094b8251d31369837b (patch) | |
| tree | 69608c869c3823df4f417d9df34866f400045533 /bin/config-include/StandaloneCommon.ini.example | |
| parent | Repair x-query-string (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.zip opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.gz opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.bz2 opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
Diffstat (limited to 'bin/config-include/StandaloneCommon.ini.example')
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 4 |
1 files changed, 4 insertions, 0 deletions
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. |