diff options
author | Mic Bowman | 2011-08-26 15:23:46 -0700 |
---|---|---|
committer | Mic Bowman | 2011-08-26 15:23:46 -0700 |
commit | 23f10f1d22d5ecf542119e39503230994c521bf0 (patch) | |
tree | 2498e8cccf2ed398052dfa53e9a1faf6e998d039 /bin/config-include | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar (diff) | |
download | opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.zip opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.gz opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.bz2 opensim-SC_OLD-23f10f1d22d5ecf542119e39503230994c521bf0.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to '')
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 431dce1..c057887 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -97,25 +97,26 @@ | |||
97 | SRV_FriendsServerURI = "http://127.0.0.1:9000" | 97 | SRV_FriendsServerURI = "http://127.0.0.1:9000" |
98 | SRV_IMServerURI = "http://127.0.0.1:9000" | 98 | SRV_IMServerURI = "http://127.0.0.1:9000" |
99 | 99 | ||
100 | ;; For Viewer 2 | 100 | ;; For Viewer 2 |
101 | MapTileURL = "http://127.0.0.1:9000/" | 101 | MapTileURL = "http://127.0.0.1:9000/" |
102 | 102 | ||
103 | ;; Ask co-operative viewers to use a different currency name | ||
103 | ;Currency = "" | 104 | ;Currency = "" |
104 | 105 | ||
105 | ;; Regular expressions for controlling which client versions are accepted/denied. | 106 | ;; Regular expressions for controlling which client versions are accepted/denied. |
106 | ;; An empty string means nothing is checked. | 107 | ;; An empty string means nothing is checked. |
107 | ;; | 108 | ;; |
108 | ;; Example 1: allow only these 3 types of clients (any version of them) | 109 | ;; Example 1: allow only these 3 types of clients (any version of them) |
109 | ;; AllowedClients = "Imprudence|Hippo|Second Life" | 110 | ;; AllowedClients = "Imprudence|Hippo|Second Life" |
110 | ;; | 111 | ;; |
111 | ;; Example 2: allow all clients except these | 112 | ;; Example 2: allow all clients except these |
112 | ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" | 113 | ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" |
113 | ;; | 114 | ;; |
114 | ;; Note that these are regular expressions, so every character counts. | 115 | ;; Note that these are regular expressions, so every character counts. |
115 | ;; Also note that this is very weak security and should not be trusted as a reliable means | 116 | ;; Also note that this is very weak security and should not be trusted as a reliable means |
116 | ;; for keeping bad clients out; modified clients can fake their identifiers. | 117 | ;; for keeping bad clients out; modified clients can fake their identifiers. |
117 | ;; | 118 | ;; |
118 | ;; | 119 | ;; |
119 | ;AllowedClients = "" | 120 | ;AllowedClients = "" |
120 | ;DeniedClients = "" | 121 | ;DeniedClients = "" |
121 | 122 | ||