From 5b6485481bbabc2cbe37af00fe55656c12db4b9e Mon Sep 17 00:00:00 2001
From: Tom Grimshaw
Date: Sat, 26 Jun 2010 11:02:09 -0700
Subject: Add extra Gitminster config options to ini.example

---
 bin/OpenSim.ini.example | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6fdfcf2..a71fe72 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -887,6 +887,13 @@
 Enabled = true
 RepoPath = "git"
 
+;How many frames between the scheduled commits?
+CommitFrameInterval = 360000
+
+;Should we automatically commit when necessary to avoid objects never making it into the repo?
+UseSafetyCommit = true
+
+
 [SVN]
     Enabled = false
     Directory = SVNmodule\repo
-- 
cgit v1.1


From 7868f1f650a7d20ca7a6b5a236f89301c193444e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 27 Jun 2010 13:06:39 -0700
Subject: Fixed Robust.32BitLaunch.exe

---
 bin/Robust.32BitLaunch.exe | Bin 5632 -> 5632 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 14a6db3..747d02f 100644
Binary files a/bin/Robust.32BitLaunch.exe and b/bin/Robust.32BitLaunch.exe differ
-- 
cgit v1.1


From 20fc35399b8193e3620b0dadca861e90c4afe216 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 28 Jun 2010 14:10:22 -0700
Subject: Fixes mantis #4815 and #4812

---
 bin/Robust.HG.ini.example                       | 4 ++++
 bin/config-include/StandaloneCommon.ini.example | 5 +++++
 2 files changed, 9 insertions(+)

(limited to 'bin')

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 39228eb..6b0029f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -198,6 +198,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; CHANGE THIS
     ExternalName = "http://127.0.0.1:8002"
 
+	; Does this grid allow incoming links to any region in it? 
+	; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+	AllowTeleportsToAnyRegion = true
+
 [UserAgentService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
     ;; for the service
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bfa6725..de8677f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -68,3 +68,8 @@
 
 [GatekeeperService]
     ExternalName = "http://127.0.0.1:9000"
+
+	; Does this grid allow incoming links to any region in it? 
+	; If false, HG TPs happen only to the  Default regions specified in [GridService] section
+	AllowTeleportsToAnyRegion = true
+
-- 
cgit v1.1


From e328c233554913393cb08fd771b64f2dd1b3de60 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 2 Jul 2010 04:03:35 +0100
Subject: Add MapTileURL to robust to supply the url needed by snowglobe

---
 bin/Robust.ini.example | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin')

diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 8331db8..96dfc01 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -134,6 +134,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
+    ; For snowglobe's web map
+    ; MapTileURL = "";
+
 
 [GridInfoService]
     ; These settings are used to return information on a get_grid_info call.
-- 
cgit v1.1


From c117f2144c94e6e04d488567d3632fdf75af4e14 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 3 Jul 2010 10:40:33 -0700
Subject: Compiled Robust.32BitLaunch.exe to .Net 3.5

---
 bin/Robust.32BitLaunch.exe | Bin 5632 -> 5632 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 747d02f..4d2698b 100644
Binary files a/bin/Robust.32BitLaunch.exe and b/bin/Robust.32BitLaunch.exe differ
-- 
cgit v1.1