diff options
| author | Tom | 2011-09-04 07:06:36 -0700 |
|---|---|---|
| committer | Tom | 2011-09-04 07:06:36 -0700 |
| commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
| tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /bin/Robust.ini.example | |
| parent | Guard another nullref (diff) | |
| parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
| download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz | |
Resolve merge commits, stage 1
Diffstat (limited to 'bin/Robust.ini.example')
| -rw-r--r-- | bin/Robust.ini.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 14f79aa..f7781ab 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -188,6 +188,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 188 | LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" | 188 | LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" |
| 189 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 189 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
| 190 | 190 | ||
| 191 | ;; Ask co-operative viewers to use a different currency name | ||
| 192 | ;Currency = "" | ||
| 193 | |||
| 191 | WelcomeMessage = "Welcome, Avatar!" | 194 | WelcomeMessage = "Welcome, Avatar!" |
| 192 | AllowRemoteSetLoginLevel = "false" | 195 | AllowRemoteSetLoginLevel = "false" |
| 193 | 196 | ||