diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /bin | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Robust.HG.ini.example | 8 | ||||
| -rw-r--r-- | bin/Robust.ini.example | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index db9f08b..e0242ab 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -395,8 +395,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 395 | HomeURI = "http://127.0.0.1:8002" | 395 | HomeURI = "http://127.0.0.1:8002" |
| 396 | 396 | ||
| 397 | [HGFriendsService] | 397 | [HGFriendsService] |
| 398 | LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService" | 398 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" |
| 399 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 399 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
| 400 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | ||
| 401 | UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | ||
| 402 | GridService = "OpenSim.Services.GridService.dll:GridService" | ||
| 403 | PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" | ||
| 400 | 404 | ||
| 401 | [HGInstantMessageService] | 405 | [HGInstantMessageService] |
| 402 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" | 406 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 326caeb..69e94a5 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -225,10 +225,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 225 | MapTileURL = "http://127.0.0.1:8002"; | 225 | MapTileURL = "http://127.0.0.1:8002"; |
| 226 | 226 | ||
| 227 | ; For V2/3 Web Profiles | 227 | ; For V2/3 Web Profiles |
| 228 | ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME] | 228 | ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" |
| 229 | 229 | ||
| 230 | ; For V2/V3 webapp authentication SSO | 230 | ; For V2/V3 webapp authentication SSO |
| 231 | OpenIDServerURL = "http://127.0.0.1/openid/openidserver/ | 231 | OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" |
| 232 | 232 | ||
| 233 | ; If you run this login server behind a proxy, set this to true | 233 | ; If you run this login server behind a proxy, set this to true |
| 234 | ; HasProxy = false | 234 | ; HasProxy = false |