diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /bin/Robust.HG.ini.example | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
| -rw-r--r-- | bin/Robust.HG.ini.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index ea271b8..b760abd 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -203,6 +203,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 203 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" | 203 | UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" |
| 204 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 204 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
| 205 | 205 | ||
| 206 | ;Currency = "" | ||
| 207 | |||
| 206 | WelcomeMessage = "Welcome, Avatar!" | 208 | WelcomeMessage = "Welcome, Avatar!" |
| 207 | AllowRemoteSetLoginLevel = "false" | 209 | AllowRemoteSetLoginLevel = "false" |
| 208 | 210 | ||