From ac866a1c46583e50e74aefad0a1bc6de720a7211 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Sep 2014 00:25:56 +0100
Subject: Add [EntityTransfer] AllowAvatarCrossing setting to determine whether
 avatars are allowed to cross regions at all.

Defaults to true.  For test purposes.
---
 bin/OpenSimDefaults.ini | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 348aaa2..dce01eb 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
 
-- 
cgit v1.1


From 3e5bc75f89998e9b1bba5e7e5f4042e883afb522 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 3 Sep 2014 13:00:09 -0400
Subject: Remove the 32 bit launchers as discussed at OpenSimulator Office Hour
 9//2/14
 http://opensimulator.org/wiki/Chat_log_from_the_meeting_on_2014-09-02. Find
 the binaries, sources and README in ./share/32BitLaunch if needed.

---
 bin/OpenSim.32BitLaunch.exe | Bin 5632 -> 0 bytes
 bin/Robust.32BitLaunch.exe  | Bin 5632 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 bin/OpenSim.32BitLaunch.exe
 delete mode 100755 bin/Robust.32BitLaunch.exe

(limited to 'bin')

diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
deleted file mode 100755
index 62c14af..0000000
Binary files a/bin/OpenSim.32BitLaunch.exe and /dev/null differ
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
deleted file mode 100755
index affedb4..0000000
Binary files a/bin/Robust.32BitLaunch.exe and /dev/null differ
-- 
cgit v1.1


From e19d1ecce8a5e1ca921323fa9e4f92ebfba73725 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Wed, 3 Sep 2014 17:00:03 -0400
Subject: Cleanup some unused code and configuration entries

---
 bin/Robust.HG.ini.example | 10 ----------
 bin/Robust.ini.example    | 10 ----------
 2 files changed, 20 deletions(-)

(limited to 'bin')

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"
 
-- 
cgit v1.1