diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /bin/config-include/HyperSimianGrid.ini | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/config-include/HyperSimianGrid.ini')
| -rw-r--r-- | bin/config-include/HyperSimianGrid.ini | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 99a589c..f561dd5 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini | |||
| @@ -91,6 +91,7 @@ | |||
| 91 | ; accessible from other grids | 91 | ; accessible from other grids |
| 92 | ; | 92 | ; |
| 93 | ProfileServerURI = "http://mygridserver.com:8002/user" | 93 | ProfileServerURI = "http://mygridserver.com:8002/user" |
| 94 | ;; If you want to protect your assets from being copied by foreign visitors | 94 | |
| 95 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 95 | ;; If you want to protect your assets from being copied by foreign visitors |
| 96 | ; OutboundPermission = False | 96 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
| 97 | ; OutboundPermission = False | ||