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/config-include | |
| 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/config-include')
| -rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 8c23c41..6b991a8 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
| @@ -115,6 +115,9 @@ | |||
| 115 | ;; Ask co-operative viewers to use a different currency name | 115 | ;; Ask co-operative viewers to use a different currency name |
| 116 | ;Currency = "" | 116 | ;Currency = "" |
| 117 | 117 | ||
| 118 | ;; Set minimum fee to publish classified | ||
| 119 | ; ClassifiedFee = 0 | ||
| 120 | |||
| 118 | ;; Regular expressions for controlling which client versions are accepted/denied. | 121 | ;; Regular expressions for controlling which client versions are accepted/denied. |
| 119 | ;; An empty string means nothing is checked. | 122 | ;; An empty string means nothing is checked. |
| 120 | ;; | 123 | ;; |