diff options
| author | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
| commit | 0a1d61950b326abffbcc0b9fe763e1cc6351acf6 (patch) | |
| tree | 934c0e80e5103c871fdf19f90ee50e0175d14895 /bin/config-include | |
| parent | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth... (diff) | |
| parent | Renamed one var and deleted commented code. No functional changes. (diff) | |
| download | opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.zip opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.gz opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.bz2 opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/GridCommon.ini.example | 2 | ||||
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index e368249..815e08c 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
| @@ -123,7 +123,7 @@ | |||
| 123 | ; Change this to your server | 123 | ; Change this to your server |
| 124 | ; accessible from other grids | 124 | ; accessible from other grids |
| 125 | ; | 125 | ; |
| 126 | ProfileServerURI = "http://mygridserver.com:8002/user" | 126 | HomeURI = "http://mygridserver.com:8002/user" |
| 127 | Gatekeeper = "http://mygridserver.com:8002" | 127 | Gatekeeper = "http://mygridserver.com:8002" |
| 128 | ;; If you want to protect your assets from being copied by foreign visitors | 128 | ;; If you want to protect your assets from being copied by foreign visitors |
| 129 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | 129 | ;; uncomment the next line. You may want to do this on sims that have licensed content. |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 84611ec..2f39218 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
| @@ -48,13 +48,13 @@ | |||
| 48 | AssetLoaderArgs = "assets/AssetSets.xml" | 48 | AssetLoaderArgs = "assets/AssetSets.xml" |
| 49 | 49 | ||
| 50 | [HGInventoryService] | 50 | [HGInventoryService] |
| 51 | ProfileServerURI = "http://127.0.0.1:9000/profiles" | 51 | HomeURI = "http://127.0.0.1:9000" |
| 52 | 52 | ||
| 53 | [HGAssetService] | 53 | [HGAssetService] |
| 54 | ProfileServerURI = "http://127.0.0.1:9000/profiles" | 54 | HomeURI = "http://127.0.0.1:9000" |
| 55 | 55 | ||
| 56 | [HGInventoryAccessModule] | 56 | [HGInventoryAccessModule] |
| 57 | ProfileServerURI = "http://127.0.0.1:9000/profiles" | 57 | HomeURI = "http://127.0.0.1:9000" |
| 58 | Gatekeeper = "http://127.0.0.1:9000" | 58 | Gatekeeper = "http://127.0.0.1:9000" |
| 59 | 59 | ||
| 60 | ;; If you want to protect your assets from being copied by foreign visitors | 60 | ;; If you want to protect your assets from being copied by foreign visitors |