From 48113f0fc811f21f4a113176caa9dbd78c0d3446 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 22 Dec 2011 19:44:52 +0000 Subject: Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain. --- bin/OpenSimDefaults.ini | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 972efe4..3e7f8a6 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -181,6 +181,11 @@ ; ## PHYSICS ; ## + ; If true then prims can be collided with by avatars, other prims, etc. + ; If false then all prims are phantom, no matter whether their phantom flag is checked or unchecked. + ; Also, no prims are subject to physics. + collidable_prim = true + ; If true then prims can be made subject to physics (gravity, pushing, etc.). ; If false then physics flag can be set but it is not honoured. However, prims are still solid for the purposes of collision direction physical_prim = true -- cgit v1.1 From f36fe45fa7468dd6e785d523c5df38666140135f Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sun, 25 Dec 2011 00:04:42 -0500 Subject: Add Copy task to Prebuild.exe (vsxxxx targets) --- bin/Prebuild.exe | Bin 228352 -> 226816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index ead3c6b..bdb25b6 100755 Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ -- cgit v1.1 From 5d8ed077bc01b46cdd4a6854cc08c735ebb66c24 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 30 Dec 2011 19:17:35 -0800 Subject: Bring back the Hyperlinker to the Robust console. Moved the config to [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis. --- bin/Robust.HG.ini.example | 2 ++ bin/config-include/GridHypergrid.ini | 2 +- bin/config-include/HyperSimianGrid.ini | 2 +- bin/config-include/StandaloneHypergrid.ini | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index eee7dc8..49ee41a 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -82,6 +82,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; * [GridService] LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + HypergridLinker = true + ; Realm = "regions" ; AllowDuplicateNames = "True" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4c32498..5f0ba37 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -26,7 +26,6 @@ LandServices = "RemoteLandServicesConnector" FriendsModule = "HGFriendsModule" MapImageService = "MapImageServiceModule" - HypergridLinker = "HypergridLinker" LandServiceInConnector = true NeighbourServiceInConnector = true @@ -60,6 +59,7 @@ ; Needed to display non-default map tile images for linked regions AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" + HypergridLinker = true AllowHypergridMapSearch = true [LibraryService] diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index ec4efc0..99a589c 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini @@ -40,7 +40,6 @@ LibraryModule = false AssetCaching = "FlotsamAssetCache" - HypergridLinker = "HypergridLinker" [SimulationDataStore] LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" @@ -56,6 +55,7 @@ StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" + HypergridLinker = true AllowHypergridMapSearch = true [LibraryService] diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index f8c258a..00beb31 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -22,7 +22,6 @@ EntityTransferModule = "HGEntityTransferModule" InventoryAccessModule = "HGInventoryAccessModule" FriendsModule = "HGFriendsModule" - HypergridLinker = "HypergridLinker" InventoryServiceInConnector = true AssetServiceInConnector = true @@ -84,6 +83,7 @@ ; Needed to display non-default map tile images for remote regions AssetService = "OpenSim.Services.AssetService.dll:AssetService" + HypergridLinker = true AllowHypergridMapSearch = true [PresenceService] -- cgit v1.1 From 6166a40440aaa505e55c5b9a71c8b7ba1daf07e0 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 3 Jan 2012 20:22:15 +0000 Subject: Update C5.dll to version 1.1.1 from 1.1.0 C5 is a collections library and can be found at http://www.itu.dk/research/c5/ This is used in the UDP texture (image) sending code. --- bin/C5.dll | Bin 272384 -> 276992 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/C5.dll b/bin/C5.dll index 1234ce9..42093e5 100755 Binary files a/bin/C5.dll and b/bin/C5.dll differ -- cgit v1.1