diff options
| author | Melanie | 2013-12-07 01:08:49 +0000 |
|---|---|---|
| committer | Melanie | 2013-12-07 01:08:49 +0000 |
| commit | 6d6b9ab791a6a759b2a3a8469569f536b3525894 (patch) | |
| tree | 9b3a1a63f8b6bd4596d11904be04e667747601c7 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Adding profile partners fix to SQLite and PgSQL drivers (diff) | |
| download | opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.zip opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.gz opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.bz2 opensim-SC_OLD-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2e2392b..83f6642 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -1039,7 +1039,7 @@ | |||
| 1039 | 1039 | ||
| 1040 | 1040 | ||
| 1041 | [UserProfiles] | 1041 | [UserProfiles] |
| 1042 | ;# {ProfileURL} {} {Set url to UserProfilesService} {} | 1042 | ;# {ProfileServiceURL} {} {Set url to UserProfilesService} {} |
| 1043 | ;; Set the value of the url to your UserProfilesService | 1043 | ;; Set the value of the url to your UserProfilesService |
| 1044 | ;; If un-set / "" the module is disabled | 1044 | ;; If un-set / "" the module is disabled |
| 1045 | ;; ProfileServiceURL = http://127.0.0.1:8002 | 1045 | ;; ProfileServiceURL = http://127.0.0.1:8002 |