aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2011-06-20 03:11:34 +0100
committerMelanie2011-06-20 03:11:34 +0100
commit6ae73aea496684cf3e72264c805216fcc7de66da (patch)
treeff42233fc49c9772aa945e062422645c8186ab7d /bin/config-include
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.zip
opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.gz
opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.bz2
opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--bin/config-include/Grid.ini6
-rw-r--r--bin/config-include/GridCommon.ini.example3
-rw-r--r--bin/config-include/GridHypergrid.ini8
-rw-r--r--bin/config-include/StandaloneCommon.ini.example4
4 files changed, 20 insertions, 1 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 5220573..da860c6 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -21,6 +21,7 @@
21 EntityTransferModule = "BasicEntityTransferModule" 21 EntityTransferModule = "BasicEntityTransferModule"
22 InventoryAccessModule = "BasicInventoryAccessModule" 22 InventoryAccessModule = "BasicInventoryAccessModule"
23 LandServices = "RemoteLandServicesConnector" 23 LandServices = "RemoteLandServicesConnector"
24 MapImageService = "MapImageServiceModule"
24 25
25 LandServiceInConnector = true 26 LandServiceInConnector = true
26 NeighbourServiceInConnector = true 27 NeighbourServiceInConnector = true
@@ -50,3 +51,8 @@
50 51
51[Friends] 52[Friends]
52 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector" 53 Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
54
55[MapImageService]
56 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
57 ; in minutes
58 RefreshTime = 60
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 27f262f..4eb6fcf 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -116,6 +116,9 @@
116 ; 116 ;
117 UserAgentServerURI = "http://mygridserver.com:8002" 117 UserAgentServerURI = "http://mygridserver.com:8002"
118 118
119[MapImageService]
120 MapImageServerURI = "http://mygridserver.com:8003"
121
119[Modules] 122[Modules]
120 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 123 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
121 ;; Copy the config .example file into your own .ini file and change configs there 124 ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index b8e66c2..60a3c62 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -25,6 +25,7 @@
25 InventoryAccessModule = "HGInventoryAccessModule" 25 InventoryAccessModule = "HGInventoryAccessModule"
26 LandServices = "RemoteLandServicesConnector" 26 LandServices = "RemoteLandServicesConnector"
27 FriendsModule = "HGFriendsModule" 27 FriendsModule = "HGFriendsModule"
28 MapImageService = "MapImageServiceModule"
28 29
29 LandServiceInConnector = true 30 LandServiceInConnector = true
30 NeighbourServiceInConnector = true 31 NeighbourServiceInConnector = true
@@ -76,4 +77,9 @@
76 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" 77 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
77 GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector" 78 GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
78 PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector" 79 PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
79 UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector" \ No newline at end of file 80 UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
81
82[MapImageService]
83 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
84 ; in minutes
85 RefreshTime = 60
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 29c2af1..cbe3fa0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -223,3 +223,7 @@
223 ; password help: optional: page providing password assistance for users of your grid 223 ; password help: optional: page providing password assistance for users of your grid
224 ; currently unused 224 ; currently unused
225 ;password = http://127.0.0.1/password 225 ;password = http://127.0.0.1/password
226
227[MapImageService]
228 ; Set this if you want to change the default
229 ; TilesStoragePath = "maptiles"