Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

7 files changed, 10 insertions, 3 deletions

diff --git a/bin/C5.dll b/bin/C5.dll
index 1234ce9..42093e5 100755
--- a/bin/C5.dll
+++ b/bin/C5.dll
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
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index ead3c6b..bdb25b6 100755
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
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]