Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 5 insertions, 0 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2c105bd..074345d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1267,6 +1267,11 @@ UseSafetyCommit = true
 ; DefaultAdministratorGroupUUID = "";
 ; DefaultAdministratorParcelName = "";
 
+[MediaOnAPrim]
+    ; Enable media on a prim facilities
+    Enabled = true;
+
+
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
 ;; These defaults allow OpenSim to work out of the box with