aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorUbitUmarov2017-11-12 03:26:48 +0000
committerUbitUmarov2017-11-12 03:26:48 +0000
commitcdb7d506fd5ceb7f77f5d5efd47acf28f61d27d9 (patch)
treea40b78c4dd6d5784313a082308fa3356a2aa2cd6 /bin
parentMerge branch 'master' into httptests (diff)
parentadd a warning in opensim.ini.example mute lists, about the fact viewers cache... (diff)
downloadopensim-SC-cdb7d506fd5ceb7f77f5d5efd47acf28f61d27d9.zip
opensim-SC-cdb7d506fd5ceb7f77f5d5efd47acf28f61d27d9.tar.gz
opensim-SC-cdb7d506fd5ceb7f77f5d5efd47acf28f61d27d9.tar.bz2
opensim-SC-cdb7d506fd5ceb7f77f5d5efd47acf28f61d27d9.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2908e9c..c8b3e5d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -710,7 +710,9 @@
710 ; the provided MuteListModule is just a Dummy 710 ; the provided MuteListModule is just a Dummy
711 ; you will need a external module for proper suport. 711 ; you will need a external module for proper suport.
712 ; if you keep both 2 following settings comment, viewers will use mutes in their caches 712 ; if you keep both 2 following settings comment, viewers will use mutes in their caches
713 ; if you uncoment both (url is ignored) the mutes will be deleted at login. 713 ; if you uncoment both (url is ignored) the mutes will be deleted at login on this instance regions
714 ; WARNING: viewers mutes cache seems to shared by all grids, including SL
715 ; this may cause some confusion.
714 716
715 ;# {MuteListModule} {MuteListModule:MuteListModule} {} {} None 717 ;# {MuteListModule} {MuteListModule:MuteListModule} {} {} None
716 ; MuteListModule = MuteListModule 718 ; MuteListModule = MuteListModule