From de20f0603fa419ba16c56d16c2ad55301cad8b83 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 Jun 2011 19:49:05 +0100
Subject: Tell hypergridders when their teleports fail because of the 4096
limit rather than just saying "destination not found"
Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module
This allows us to explicitly tell the hypergridder why the teleport failed (region out of range).
It also allows people on regions that are within range (on a large source grid) to teleport.
The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini
Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit. It could also be decreased.
The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding.
---
bin/OpenSimDefaults.ini | 4 ++++
bin/config-include/StandaloneCommon.ini.example | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fa5392d..7321cad 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -504,6 +504,10 @@
; Distance in meters that shouts should travel. Default is 100m
shout_distance = 100
+[EntityTransfer]
+ ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
+ ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
+ max_distance = 4095
[Messaging]
; Control which region module is used for instant messaging.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index cbe3fa0..ee0523f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -63,9 +63,6 @@
;;--- For MySql region storage (alternative)
;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
- ;; With hypergrid, perform distance check for the creation of a linked region
- ; Check4096 = true
-
;; Directory for map tile images of remote regions
; MapTileDirectory = "./maptiles"
--
cgit v1.1
From 0dd3281caf09090e86036d67a34939b0e31c1b16 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 21 Jun 2011 12:43:44 +0300
Subject: Optionally, don't delete previously compiled scripts on startup
---
bin/OpenSimDefaults.ini | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 7321cad..db4836a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1124,6 +1124,12 @@
;; Path to script assemblies
; ScriptEnginesPath = "ScriptEngines"
+ ; Whether to delete previously compiled scripts when the sim starts. If you disable this
+ ; then startup will be faster. However, then it becomes your responsibility to delete the
+ ; compiled scripts if OpenSim has changed enough that previously compiled scripts are no
+ ; longer compatible.
+ DeleteScriptsOnStartup = true
+
[OpenGridProtocol]
;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
--
cgit v1.1
From 698cd0b3c2b9827cfbb83df5c587b7740238a2bb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 25 Jun 2011 01:33:09 +0100
Subject: Remove the now unused [cms] section from OpenSimDefaults.ini
---
bin/OpenSimDefaults.ini | 5 -----
1 file changed, 5 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index db4836a..57db852 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -859,11 +859,6 @@
;exclude_list=User 1,User 2,User 3
-[CMS]
- enabled = false
- ;channel = 345
-
-
; The following settings control the progression of daytime
; in the Sim. The defaults are the same as the commented out settings
[Sun]
--
cgit v1.1
From e11c959400380ff7ef05e972ed6f730efa7a6f48 Mon Sep 17 00:00:00 2001
From: Makopoppo
Date: Mon, 27 Jun 2011 22:28:33 +0900
Subject: [PATCH] Changed Wind parameters default value in OpenSim.ini.example
according to implementation
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
---
bin/OpenSim.ini.example | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bab118f..98bb355 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -443,8 +443,8 @@
;; to ConfigurableWind and uncomment the following.
; avg_strength = 5.0
; avg_direction = 0.0
- ; var_strength = 0.0
- ; var_direction = 0.0
+ ; var_strength = 5.0
+ ; var_direction = 30.0
; rate_change = 1.0
;# {strength} {enabled:true wind_plugin:SimpleRandomWind} {Wind strength?} {} 1.0
--
cgit v1.1