Merge branch 'master' into bullet-2.82

5 files changed, 3 insertions, 20 deletions

diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
deleted file mode 100755
index 62c14af..0000000
--- a/bin/OpenSim.32BitLaunch.exe
+++ /dev/null
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2cd32c6..5361e8d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -711,6 +711,9 @@
     ;
     max_distance = 65535
 
+    ; Allow avatars to cross into and out of the region.
+    AllowAvatarCrossing = true
+
     ; Minimum user level required for HyperGrid teleports
     LevelHGTeleport = 0
 
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
deleted file mode 100755
index affedb4..0000000
--- a/bin/Robust.32BitLaunch.exe
+++ /dev/null
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 684c019..edcbec3 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -372,16 +372,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; Url to search service
     ; SearchURL = "http://127.0.0.1:8002/";
 
-    ; For V2/3 Web Profiles
-    ; Work in progress: The ProfileServerURL/OpenIDServerURL are
-    ; being used in a development viewer as support for webprofiles
-    ; is being developed across the componets
-    ;
-    ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
-    ;
-    ; For V2/V3 webapp authentication SSO
-    ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
-
     ; For V3 destination guide
     ; DestinationGuide = "http://127.0.0.1/guide"
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index eafab64..6686c3f 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -331,16 +331,6 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; Url to search service
     ; SearchURL = "http://127.0.0.1:8002/";
 
-    ; For V2/3 Web Profiles
-    ; Work in progress: The ProfileServerURL/OpenIDServerURL are
-    ; being used in a development viewer as support for webprofiles
-    ; is being developed across the componets
-    ;
-    ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
-    ;
-    ; For V2/V3 webapp authentication SSO
-    ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
-
     ; For V3 destination guide
     ; DestinationGuide = "http://127.0.0.1/guide"