ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2012-07-13 02:27:16 +01:00
parent d632fd7124 2954ceccae
commit 64393a7ca8
28 changed files with 177 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/OpenSim.ini.example
View File

@@ -280,18 +280,18 @@
;; default is false
; TelehubAllowLandmark = false
;# {AllowedViewerList} {} {Comma separated list of allowed viewers} {}
;; Comma separated list of viewers which may gain access to the regions.
;; One can use a Substring of the viewer name to enable only certain subversions
;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
;; Bar (|) separated list of viewers which may gain access to the regions.
;; One can use a substring of the viewer name to enable only certain versions
;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
;; - "Imprudence" has access
;; - "Imprudence 1.3" has access
;; - "Imprudence 1.3.1" has no access
;; AllowedViewerList =
; AllowedViewerList =
;# {BannedViewerList} {} {Comma separated list of banned viewers} {}
;# Comma separated list of viewers which may not gain access to the regions.
;; One can use a Substring of the viewer name to disable only certain subversions
;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
;# Bar (|) separated list of viewers which may not gain access to the regions.
;; One can use a Substring of the viewer name to disable only certain versions
;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
;; - "Imprudence" has no access
;; - "Imprudence 1.3" has no access