diff options
| author | Melanie | 2013-06-18 01:50:08 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-18 01:50:08 +0100 |
| commit | 56f4adeb60622aaec687f3a6699a03c964f59d5b (patch) | |
| tree | 0ba2fe5ffd3984b41fab05b56361fda507b2a34a /bin/Robust.ini.example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | correct method doc for llRot2Axis() (diff) | |
| download | opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.zip opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.gz opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.bz2 opensim-SC-56f4adeb60622aaec687f3a6699a03c964f59d5b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
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 7d6492b..da1b43a 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -274,6 +274,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto | |||
| 274 | ; Ask co-operative viewers to use a different currency name | 274 | ; Ask co-operative viewers to use a different currency name |
| 275 | ;Currency = "" | 275 | ;Currency = "" |
| 276 | 276 | ||
| 277 | ;; Set minimum fee to publish classified | ||
| 278 | ; ClassifiedFee = 0 | ||
| 279 | |||
| 277 | WelcomeMessage = "Welcome, Avatar!" | 280 | WelcomeMessage = "Welcome, Avatar!" |
| 278 | AllowRemoteSetLoginLevel = "false" | 281 | AllowRemoteSetLoginLevel = "false" |
| 279 | 282 | ||