aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-12-14 00:12:17 +0000
committerJustin Clark-Casey (justincc)2010-12-14 00:12:17 +0000
commite08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5 (patch)
treefc4a33689299573e29ad4bf1e7aa74e821cf68d9 /bin
parentreinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u... (diff)
parentFix a small bug in ban list handling (diff)
downloadopensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.zip
opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.gz
opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.bz2
opensim-SC-e08da02a0fe3bcf19c6cc84023e56f81e3b1a7f5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/Robust.HG.ini.example6
-rw-r--r--bin/config-include/GridCommon.ini.example3
-rw-r--r--bin/config-include/GridHypergrid.ini9
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
-rw-r--r--bin/config-include/StandaloneHypergrid.ini11
5 files changed, 25 insertions, 7 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index c690e06..9adf1ac 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -68,6 +68,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
68 ;; Perform distance check for the creation of a linked region 68 ;; Perform distance check for the creation of a linked region
69 ; Check4096 = "True" 69 ; Check4096 = "True"
70 70
71 ;; Needed to display non-default map tile images for linked regions
72 AssetService = "OpenSim.Services.AssetService.dll:AssetService"
73
74 ;; Directory for map tile images of linked regions
75 ; MapTileDirectory = "./"
76
71 ;; Next, we can specify properties of regions, including default and fallback regions 77 ;; Next, we can specify properties of regions, including default and fallback regions
72 ;; The syntax is: Region_<RegionName> = "<flags>" 78 ;; The syntax is: Region_<RegionName> = "<flags>"
73 ;; or: Region_<RegionID> = "<flags>" 79 ;; or: Region_<RegionID> = "<flags>"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 1122cbd..761e5eb 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -42,6 +42,9 @@
42 GridServerURI = "http://mygridserver.com:8003" 42 GridServerURI = "http://mygridserver.com:8003"
43 ;AllowHypergridMapSearch = true 43 ;AllowHypergridMapSearch = true
44 44
45 ;; Directory for map tile images of linked regions
46 ; MapTileDirectory = "./"
47
45[AvatarService] 48[AvatarService]
46 ; 49 ;
47 ; change this to your grid-wide grid server 50 ; change this to your grid-wide grid server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 409b2a9..e983755 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -44,12 +44,15 @@
44 LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector" 44 LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector"
45 45
46[GridService] 46[GridService]
47 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, 47 ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
48 ; which in turn uses this 48 ; which in turn uses this
49 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 49 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
50 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 50 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
51 51
52 AllowHypergridMapSearch = true 52 ; Needed to display non-default map tile images for linked regions
53 AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
54
55 AllowHypergridMapSearch = true
53 56
54[LibraryService] 57[LibraryService]
55 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" 58 LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 58059f5..4956bc3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -65,6 +65,9 @@
65 ;; With hypergrid, perform distance check for the creation of a linked region 65 ;; With hypergrid, perform distance check for the creation of a linked region
66 ; Check4096 = true 66 ; Check4096 = true
67 67
68 ;; Directory for map tile images of remote regions
69 ; MapTileDirectory = "./"
70
68 ;; Next, we can specify properties of regions, including default and fallback regions 71 ;; Next, we can specify properties of regions, including default and fallback regions
69 ;; The syntax is: Region_<RegioName> = "<flags>" 72 ;; The syntax is: Region_<RegioName> = "<flags>"
70 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut 73 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 68aa739..486f22e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -65,12 +65,15 @@
65 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 65 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
66 66
67[GridService] 67[GridService]
68 ; LocalGridServicesConnector needs this 68 ; LocalGridServicesConnector needs this
69 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 69 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
70 Realm = "regions" 70 Realm = "regions"
71 StorageProvider = "OpenSim.Data.Null.dll" 71 StorageProvider = "OpenSim.Data.Null.dll"
72 72
73 AllowHypergridMapSearch = true 73 ; Needed to display non-default map tile images for remote regions
74 AssetService = "OpenSim.Services.AssetService.dll:AssetService"
75
76 AllowHypergridMapSearch = true
74 77
75[PresenceService] 78[PresenceService]
76 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" 79 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"