From de47646c3de1fd56df71b700c817e67663e8a751 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 23 Oct 2012 17:34:14 -0700
Subject: BulletSim: update binaries with small change that insures that manual
position/rotation setting results in an update event.
---
bin/lib32/BulletSim.dll | Bin 598016 -> 598016 bytes
bin/lib32/libBulletSim.so | Bin 2772750 -> 2772770 bytes
bin/lib64/BulletSim.dll | Bin 764416 -> 764416 bytes
bin/lib64/libBulletSim.so | Bin 3031835 -> 3031859 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index f976efe..fbc83e6 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index a00bc3a..65d3805 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index acaa9c8..936368a 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 996ea21..82fbad6 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
--
cgit v1.1
From 424f68b64b72ed8402a01c4d9090bfe6dc7d2b09 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Sun, 21 Oct 2012 13:17:39 +0200
Subject: Changed duplicate Asset ID's to unique ID's in
CollisionSoundsAssetSet.xml
---
.../CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'bin')
diff --git a/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
index 7498ae0..b570c55 100644
--- a/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
+++ b/bin/assets/CollisionSoundsAssetSet/CollisionSoundsAssetSet.xml
@@ -303,37 +303,37 @@
-
+
--
cgit v1.1
From e0b5a3cd900d8ad29cdb7d43415b069d5484a424 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Tue, 16 Oct 2012 15:15:03 +0100
Subject: tweaking configuration logic so that the INonSharedRegionModule will
load by default
---
bin/OpenSimDefaults.ini | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index dffc0ac..afb6fed 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1687,5 +1687,13 @@ Enabled = False
;; default is module is disabled at the top level
AutoBackupModuleEnabled = false
+[Sounds]
+ ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModuleNonShared}
+ ;; Currently only INonSharedRegionModule module is implemented.
+ Module = SoundModuleNonShared
+
+ ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
+ MaxDistance = 100.0
+
[Modules]
Include-modules = "addon-modules/*/config/*.ini"
--
cgit v1.1
From a16ddbee4116fd1234bb2d53598616d5345c09c9 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Mon, 29 Oct 2012 16:05:02 +0000
Subject: Renaming module back to SoundModule as the hypothetical plan was to
make another module using the shared region module interface, but this was
pointed out by Melanie_T to be mostly pointless.
---
bin/OpenSimDefaults.ini | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index afb6fed..6d1af7c 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1688,9 +1688,8 @@ Enabled = False
AutoBackupModuleEnabled = false
[Sounds]
- ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModuleNonShared}
- ;; Currently only INonSharedRegionModule module is implemented.
- Module = SoundModuleNonShared
+ ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModule}
+ Module = SoundModule
;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
MaxDistance = 100.0
--
cgit v1.1
From a09cba6da363606f0e2d63118b63f5b05232c452 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Mon, 29 Oct 2012 16:17:18 +0000
Subject: refactoring to use assembly:classname style of configuration
---
bin/OpenSimDefaults.ini | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6d1af7c..fa284bd 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1688,8 +1688,8 @@ Enabled = False
AutoBackupModuleEnabled = false
[Sounds]
- ;; {Module} {} {Implementation of ISoundModule to use.} {SoundModule}
- Module = SoundModule
+ ;; {Module} {} {Implementation of ISoundModule to use.} {OpenSim.Region.CoreModules.dll:SoundModule}
+ Module = OpenSim.Region.CoreModules.dll:SoundModule
;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
MaxDistance = 100.0
--
cgit v1.1
From ccb17eab714428e5bcfab91a20203a23f84bc21e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Nov 2012 03:31:30 +0000
Subject: Replace the 64 bit macosx version of libopenjpeg-dotnet.dylib with a
32-bit version from libopenmetaverse commit 3731ee4
This is because macosx mono is 32-bit and this can't p/invoke 64-bit binaries.
However, the reverse is also true.
If OpenSimulator stops working for you then please complain! Long term alternative is probably to build a fat binary with both architectures.
---
bin/lib64/libopenjpeg-dotnet.dylib | Bin 147288 -> 130560 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib
index 18ca868..91f7264 100755
Binary files a/bin/lib64/libopenjpeg-dotnet.dylib and b/bin/lib64/libopenjpeg-dotnet.dylib differ
--
cgit v1.1
From ce7beb6f20cb09e19e0f695f445cfa860b9e9c78 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Nov 2012 01:41:38 +0000
Subject: Add [AssetService] AllowRemoteDeleteAllTypes (default false).
This allows a closed grid to delete asset types other than maptile remotely.
Only operational if AllowRemoteDelete = true also.
Defaults to false - do not enable if anybody other than you can make asset service requests.
---
bin/Robust.ini.example | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
(limited to 'bin')
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 2eb551d..7503c5e 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -77,7 +77,19 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
AssetLoaderArgs = "./assets/AssetSets.xml"
- AllowRemoteDelete = "false"
+
+ ; Allow maptile assets to remotely deleted by remote calls to the asset service.
+ ; There is no harm in having this as false - it just means that historical maptile assets are not deleted.
+ ; This only applies to maptiles served via the version 1 viewer mechanisms
+ ; Default is false
+ AllowRemoteDelete = false
+
+ ; Allow all assets to be remotely deleted.
+ ; Only set this to true if you are operating a grid where you control all calls to the asset service
+ ; (where a necessary condition is that you control all simulators) and you need this for admin purposes.
+ ; If set to true, AllowRemoteDelete = true is required as well.
+ ; Default is false.
+ AllowRemoteDeleteAllTypes = false
; * This configuration loads the inventory server modules. It duplicates
; * the function of the legacy inventory server
--
cgit v1.1
From 7412795a0bedae060e9f2bce2fa12e0497916f6e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 2 Nov 2012 08:05:56 -0700
Subject: HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS
AGAINST THESE.
---
bin/Robust.HG.ini.example | 9 +-
bin/config-include/StandaloneCommon.ini.example | 162 ++++++++++++++----------
bin/config-include/StandaloneHypergrid.ini | 8 +-
3 files changed, 107 insertions(+), 72 deletions(-)
(limited to 'bin')
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 82ef44d..4ecc6b0 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -485,8 +485,15 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
; *
[HGInventoryService]
; For the InventoryServiceInConnector
- LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+ LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+ ;; alternatives:
+ ;; HG1.5, more permissive, not recommended, but still supported
+ ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+ ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+ ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
+
UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+ AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
HomeURI = "http://127.0.0.1:8002"
; * The interface that local users get when they are in other grids.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 84de0ec..f28de43 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -47,36 +47,6 @@
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
AssetLoaderArgs = "assets/AssetSets.xml"
-[HGInventoryService]
- HomeURI = "http://127.0.0.1:9000"
-
-[HGAssetService]
- HomeURI = "http://127.0.0.1:9000"
-
- ;; The asset types that this grid can export to / import from other grids.
- ;; Comma separated.
- ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
- ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
- ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
- ;;
- ;; Leave blank or commented if you don't want to apply any restrictions.
- ;; A more strict, but still reasonable, policy may be to disallow the exchange
- ;; of scripts, like so:
- ; DisallowExport ="LSLText"
- ; DisallowImport ="LSLBytecode"
-
-
-[HGInventoryAccessModule]
- HomeURI = "http://127.0.0.1:9000"
- Gatekeeper = "http://127.0.0.1:9000"
-
- ;; If you want to protect your assets from being copied by foreign visitors
- ;; uncomment the next line. You may want to do this on sims that have licensed content.
- ; OutboundPermission = False
-
-[HGFriendsModule]
- ; User level required to be able to send friendship invitations to foreign users
- ;LevelHGFriends = 0;
[GridService]
;; For in-memory region storage (default)
@@ -97,11 +67,6 @@
;; change this to the address of your simulator
Gatekeeper="http://127.0.0.1:9000"
-[Messaging]
- ; === HG ONLY ===
- ;; change this to the address of your simulator
- Gatekeeper = "http://127.0.0.1:9000"
-
[LibraryModule]
; Set this if you want to change the name of the OpenSim Library
;LibraryName = "My World's Library"
@@ -140,41 +105,6 @@
;AllowedClients = ""
;DeniedClients = ""
-[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
-
- ;; Regular expressions for controlling which client versions are accepted/denied.
- ;; An empty string means nothing is checked.
- ;;
- ;; Example 1: allow only these 3 types of clients (any version of them)
- ;; AllowedClients = "Imprudence|Hippo|Second Life"
- ;;
- ;; Example 2: allow all clients except these
- ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
- ;;
- ;; Note that these are regular expressions, so every character counts.
- ;; Also note that this is very weak security and should not be trusted as a reliable means
- ;; for keeping bad clients out; modified clients can fake their identifiers.
- ;;
- ;;
- ;AllowedClients = ""
- ;DeniedClients = ""
-
- ;; Are foreign visitors allowed?
- ;ForeignAgentsAllowed = true
- ;;
- ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
- ;; Leave blank or commented for no exceptions.
- ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
- ;;
- ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
- ;; Leave blank or commented for no exceptions.
- ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
-
[FreeswitchService]
;; If FreeSWITCH is not being used then you don't need to set any of these parameters
@@ -279,6 +209,44 @@
; Example:
; Region_Test_1 = "DisallowForeigners"
+;;
+;; HG configurations
+;;
+[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
+
+ ;; Regular expressions for controlling which client versions are accepted/denied.
+ ;; An empty string means nothing is checked.
+ ;;
+ ;; Example 1: allow only these 3 types of clients (any version of them)
+ ;; AllowedClients = "Imprudence|Hippo|Second Life"
+ ;;
+ ;; Example 2: allow all clients except these
+ ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+ ;;
+ ;; Note that these are regular expressions, so every character counts.
+ ;; Also note that this is very weak security and should not be trusted as a reliable means
+ ;; for keeping bad clients out; modified clients can fake their identifiers.
+ ;;
+ ;;
+ ;AllowedClients = ""
+ ;DeniedClients = ""
+
+ ;; Are foreign visitors allowed?
+ ;ForeignAgentsAllowed = true
+ ;;
+ ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
+ ;; Leave blank or commented for no exceptions.
+ ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
+ ;;
+ ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
+ ;; Leave blank or commented for no exceptions.
+ ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
+
[UserAgentService]
;; User level required to be contacted from other grids
;LevelOutsideContacts = 0
@@ -299,3 +267,57 @@
;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
;; Leave blank or commented for no exceptions.
; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
+
+[HGInventoryService]
+ HomeURI = "http://127.0.0.1:9000"
+
+[HGAssetService]
+ HomeURI = "http://127.0.0.1:9000"
+
+ ;; The asset types that this grid can export to / import from other grids.
+ ;; Comma separated.
+ ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+ ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText,
+ ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh
+ ;;
+ ;; Leave blank or commented if you don't want to apply any restrictions.
+ ;; A more strict, but still reasonable, policy may be to disallow the exchange
+ ;; of scripts, like so:
+ ; DisallowExport ="LSLText"
+ ; DisallowImport ="LSLBytecode"
+
+
+[HGInventoryAccessModule]
+ HomeURI = "http://127.0.0.1:9000"
+ Gatekeeper = "http://127.0.0.1:9000"
+
+ ;; If you want to protect your assets from being copied by foreign visitors
+ ;; uncomment the next line. You may want to do this on sims that have licensed content.
+ ;; true = allow exports, false = disallow exports. True by default.
+ ; OutboundPermission = True
+
+ ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+ ;; and available when they return. True by default.
+ ;RestrictInventoryAccessAbroad = True
+
+[HGFriendsModule]
+ ; User level required to be able to send friendship invitations to foreign users
+ ;LevelHGFriends = 0;
+
+[Messaging]
+ ; === HG ONLY ===
+ ;; change this to the address of your simulator
+ Gatekeeper = "http://127.0.0.1:9000"
+
+
+[EntityTransfer]
+ ;; User level from which local users are allowed to HG teleport. Default 0 (all users)
+ ;LevelHGTeleport = 0
+
+ ;; Are local users restricted from taking their appearance abroad?
+ ;; Default is no restrictions
+ ;RestrictAppearanceAbroad = false
+
+ ;; If appearance is restricted, which accounts' appearances are allowed to be exported?
+ ;; Comma-separated list of account names
+ AccountForAppearance = "Test User, Astronaut Smith"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 76d588c..195e780 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -152,7 +152,13 @@
;; This greatly restricts the inventory operations while in other grids
[HGInventoryService]
; For the InventoryServiceInConnector
- LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+ LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
+ ;; alternatives:
+ ;; HG1.5, more permissive, not recommended, but still supported
+ ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
+ ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust
+ ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
+
UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
--
cgit v1.1
From 895d28f14dd2802a0af2349d8f7c34643a8dae06 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 3 Nov 2012 21:28:23 -0700
Subject: BulletSim: update the DLLs and SOs
---
bin/lib32/BulletSim.dll | Bin 598016 -> 598528 bytes
bin/lib32/libBulletSim.so | Bin 2772770 -> 2773926 bytes
bin/lib64/BulletSim.dll | Bin 764416 -> 764928 bytes
bin/lib64/libBulletSim.so | Bin 3031859 -> 3033275 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index fbc83e6..0ed960a 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 65d3805..f71c308 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 936368a..701ee4c 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 82fbad6..cc839f6 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
--
cgit v1.1
From 6df9d40d9904afbfb327cbc07dcc75f3a6a820e2 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 6 Nov 2012 18:14:02 -0800
Subject: BulletSim: update the DLLs and SOs
---
bin/lib32/BulletSim.dll | Bin 598528 -> 599040 bytes
bin/lib32/libBulletSim.so | Bin 2773926 -> 2778687 bytes
bin/lib64/BulletSim.dll | Bin 764928 -> 765440 bytes
bin/lib64/libBulletSim.so | Bin 3033275 -> 3034072 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 0ed960a..51526a7 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index f71c308..8bb9d10 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 701ee4c..1a07d6a 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index cc839f6..bbdd380 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
--
cgit v1.1
From 4ac857f9025a8308b0e14adbddffd89b467caf17 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 10 Nov 2012 08:48:31 -0800
Subject: One more module: EventQueueGetModule. Also making it non-optional for
this dll.
---
bin/OpenSimDefaults.ini | 3 ---
1 file changed, 3 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fa284bd..4b58985 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -57,9 +57,6 @@
; ## CLIENTS
; ##
- ; Enables EventQueueGet Service.
- EventQueue = true
-
; Set this to the DLL containing the client stack to use.
clientstack_plugin="OpenSim.Region.ClientStack.LindenUDP.dll"
--
cgit v1.1
From a180fef99e556b7f8a3ec3e38ea3859174b57c4d Mon Sep 17 00:00:00 2001
From: PixelTomsen
Date: Sun, 11 Nov 2012 18:33:16 +0100
Subject: remove entry OpenGridProtocol in OpenSimDefaults.ini - module was
deleted
Signed-off-by: Diva Canto
---
bin/OpenSimDefaults.ini | 10 ----------
1 file changed, 10 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4b58985..ed1b969 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1418,16 +1418,6 @@
; DeleteScriptsOnStartup = false
-[OpenGridProtocol]
- ;These are the settings for the Open Grid Protocol.. the Agent Domain, Region Domain, you know..
- ;On/true or Off/false
- ogp_enabled=false
-
- ;Name Prefix/suffix when using OGP
- ogp_firstname_prefix=""
- ogp_lastname_suffix="_EXTERNAL"
-
-
[Concierge]
; Enable concierge module
; Default is false
--
cgit v1.1
From 90c6d2e50cc22ebca3b1be7127d68aaadcdef4e1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Nov 2012 02:25:07 +0000
Subject: Stop Prebuild from generating statements which unnecessarily
copy files into bin/Debug or bin/Release
nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of on both nant 0.91 and nant 0.92
Will be submitting this patch to prebuild project for comment though I suspect there's nobody there to pay attention.
---
bin/Prebuild.exe | Bin 226816 -> 229376 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index bdb25b6..a202443 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
--
cgit v1.1
From f977291a44d867e96a05282cea257d33f65bafbd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Nov 2012 02:40:37 +0000
Subject: Replace previously updated Prebuild.exe with one built directly with
mono 2.4.3
---
bin/Prebuild.exe | Bin 229376 -> 226304 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index a202443..3a670b7 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
--
cgit v1.1
From 7861090a17960ce359794dc8cee29741bbb6aa14 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 14 Nov 2012 02:44:10 +0000
Subject: Replace old Prebuild.exe accidentally added back in f977291 with one
built without nant target generation and on mono 2.4.3
---
bin/Prebuild.exe | Bin 226304 -> 224768 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 3a670b7..1d4a8e8 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
--
cgit v1.1
From 079a1e704fcaa9fddc9bb3de0a205969cba058bc Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 18 Nov 2012 18:17:30 -0800
Subject: BulletSim: remove the obsolete interface to the Bullet code. Update
BulletSim libraries with code stripped of the obsolete code.
---
bin/lib32/BulletSim.dll | Bin 599040 -> 551424 bytes
bin/lib32/libBulletSim.so | Bin 2778687 -> 1707213 bytes
bin/lib64/BulletSim.dll | Bin 765440 -> 699904 bytes
bin/lib64/libBulletSim.so | Bin 3034072 -> 1844124 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 51526a7..9c8cf00 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 8bb9d10..0277cf1 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 1a07d6a..5675ff3 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index bbdd380..49396a8 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
--
cgit v1.1
From 665f79e15c1de3a98f777004cba278625b8b3181 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Mon, 19 Nov 2012 21:47:49 -0500
Subject: Expose configuration options for the XmlRpcGridRouter
Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service
---
bin/OpenSim.ini.example | 23 ++++++++++++++++++++++-
bin/OpenSimDefaults.ini | 14 --------------
2 files changed, 22 insertions(+), 15 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c7df7bb..e591a69 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -443,9 +443,30 @@
;; What is reported as the "User-Agent" when using llHTTPRequest
;; Defaults to not sent if not set here. See the notes section in the wiki
;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
- ;; " (Mozilla Compatible)" to the text where there are problems with a web server
+ ;; " (Mozilla Compatible)" to the text where there are problems with a
+ ;; web server
; user_agent = "OpenSim LSL (Mozilla Compatible)"
+[XMLRPC]
+ ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
+ ;; If enabled and set to XmlRpcRouterModule, this will post an event,
+ ;; "xmlrpc_uri(string)" to the script concurrently with the first
+ ;; remote_data event. This will contain the fully qualified URI an
+ ;; external site needs to use to send XMLRPC requests to that script
+ ;;
+ ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
+ ;; will be registered with an external service via a configured uri
+ ;XmlRpcRouterModule = "XmlRpcRouterModule"
+
+ ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
+ ;XmlRpcPort = 20800
+
+ ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com
+ ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
+ ;; will use this address to register xmlrpc channels on the external
+ ;; service
+ ; XmlRpcHubURI = http://example.com
+
[ClientStack.LindenUDP]
;; See OpensSimDefaults.ini for the throttle options. You can copy the
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ed1b969..c81c658 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -429,20 +429,6 @@
; many simultaneous requests, default is 30 and is currently applied only to assets
;MaxRequestConcurrency = 30
-[XMLRPC]
- ; ##
- ; ## Scripting XMLRPC mapper
- ; ##
-
- ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
- ; script concurrently with the first remote_data event.
- ; This will contain the fully qualified URI an external site needs
- ; to use to send XMLRPC requests to that script
-
- ;XmlRpcRouterModule = "XmlRpcRouterModule"
- ;XmlRpcPort = 20800
-
-
[ClientStack.LindenUDP]
; Set this to true to process incoming packets asynchronously. Networking is
; already separated from packet handling with a queue, so this will only
--
cgit v1.1
From cbc7e7bf85bfd9e916146b0ae4a605996c24720b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 21 Nov 2012 16:31:23 -0800
Subject: BulletSim: Make avatar capsule so it is not circular. Simple attempt
to make avatars better shaped. Replace parameter 'avatarCapsuleRadius' with
'avatarCapsuleWidth' and 'avatarCapsuleDepth'. More tweeking to avatar height
calculation. A little better but short avatar's feet are above the terrain
and tall avatar's feet are a little below the ground.
---
bin/OpenSimDefaults.ini | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c81c658..818321e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -913,7 +913,8 @@
AvatarFriction = 0.2
AvatarRestitution = 0.0
AvatarDensity = 60.0
- AvatarCapsuleRadius = 0.37
+ AvatarCapsuleWidth = 0.6
+ AvatarCapsuleDepth = 0.45
AvatarCapsuleHeight = 1.5
AvatarContactProcessingThreshold = 0.1
--
cgit v1.1
From 56ef180c92b33d1a0ce24990868253c96fd9fd84 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 21 Nov 2012 16:36:50 -0800
Subject: BulletSim: update DLLs and SOs. No functional changes. Only the
parameter block format changed.
---
bin/lib32/BulletSim.dll | Bin 551424 -> 551424 bytes
bin/lib32/libBulletSim.so | Bin 1707213 -> 1707321 bytes
bin/lib64/BulletSim.dll | Bin 699904 -> 699904 bytes
bin/lib64/libBulletSim.so | Bin 1844124 -> 1844228 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 9c8cf00..2ae1c75 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index 0277cf1..d4852a5 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 5675ff3..77cf7e3 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 49396a8..4ec62b2 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
--
cgit v1.1
From f473252fa8022f95f60e219b24ffa342966f8c13 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Nov 2012 03:56:53 +0000
Subject: Add AllowRegionRestartFromClient setting to [EstateManagement]
section of OpenSim.ini.
Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate.
One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules,
though these should be fixed as soon as practicable.
Default is true, as has been the case historically.
---
bin/OpenSimDefaults.ini | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 818321e..19e081f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -368,6 +368,12 @@
; alert_uri = "http://myappserver.net/my_handler/"
+[EstateManagement]
+ ; If false, then block any region restart requests from the client even if they are otherwise valid.
+ ; Default is true
+ AllowRegionRestartFromClient = true
+
+
[SMTP]
enabled = false
--
cgit v1.1
From edbdbd44b95b6fb11958eda1cd8e70da799849b5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Nov 2012 04:09:45 +0000
Subject: Enable further client stack packet pooling by default by setting
RecycleBaseUDPPackets = true by default.
This reduces base memory churn of every client connection, improving the garbage collection situation.
The effect is a significant portion of base load (an avatar standing still on a completely blank island)
but will probably still be swallowed up by other memory use on active regions.
Tests have shown no noticeable impact on speed of processing incoming packets, though setting remains
in case a switch back is needed.
---
bin/OpenSimDefaults.ini | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 19e081f..8a451ec 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1592,8 +1592,7 @@
; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
; This reduces data churn
- ; This setting is currently experimental and defaults to false.
- RecycleBaseUDPPackets = false;
+ RecycleBaseUDPPackets = true
[InterestManagement]
--
cgit v1.1