Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

2 files changed, 3 insertions, 1 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9afac3f..58e9b10 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1153,6 +1153,8 @@
     ; currently unused
     ; AllowosConsoleCommand=false
 
+    ; Are god functions such as llSetObjectPermMask() allowed?  If true then gods and only gods have access to these functions.
+    ; If false then gods cannot execute these functions either.
     AllowGodFunctions = false
 
     ; Maximum number of llListen events we allow over the entire region.
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 1c04ab5..f70d13b 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -166,7 +166,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
     ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
     ;; Default is false
-    ; CreateDefaultAvatarEntries = false
+    CreateDefaultAvatarEntries = true
 
     ;; Allow the service to process HTTP createuser calls.
     ;; Default is false.