aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-03-11 00:16:31 +0000
committerJustin Clark-Casey (justincc)2014-03-11 00:16:31 +0000
commit932c9e757b1e4ba519ba9d486e9773290c5b3719 (patch)
tree755cb9976d4d7b8bdc6b196cbc612a635201323a /bin/config-include
parentSend group notices through the same messaging module mechanism used to send g... (diff)
parentfix missing quote for xBakes connector in Robust example ini files (diff)
downloadopensim-SC-932c9e757b1e4ba519ba9d486e9773290c5b3719.zip
opensim-SC-932c9e757b1e4ba519ba9d486e9773290c5b3719.tar.gz
opensim-SC-932c9e757b1e4ba519ba9d486e9773290c5b3719.tar.bz2
opensim-SC-932c9e757b1e4ba519ba9d486e9773290c5b3719.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/Grid.ini3
-rw-r--r--bin/config-include/GridHypergrid.ini3
-rw-r--r--bin/config-include/Standalone.ini3
-rw-r--r--bin/config-include/StandaloneHypergrid.ini2
4 files changed, 0 insertions, 11 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 69a209a..e7141a1 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -64,6 +64,3 @@
64 64
65[MapImageService] 65[MapImageService]
66 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" 66 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
67
68 ; in minutes
69 RefreshTime = 60
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 2a66b4c..8f17527 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -96,6 +96,3 @@
96 96
97[MapImageService] 97[MapImageService]
98 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" 98 LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
99
100 ; in minutes
101 RefreshTime = 60
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 424d8c8..ee07e74 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -119,9 +119,6 @@
119[MapImageService] 119[MapImageService]
120 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 120 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
121 121
122 ; in minutes
123 RefreshTime = 60
124
125;; This should always be the very last thing on this file 122;; This should always be the very last thing on this file
126[Includes] 123[Includes]
127 Include-Common = "config-include/StandaloneCommon.ini" 124 Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 370ab90..f39cf09 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -133,8 +133,6 @@
133 133
134[MapImageService] 134[MapImageService]
135 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 135 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
136 ; in minutes
137 RefreshTime = 60
138 136
139[GatekeeperService] 137[GatekeeperService]
140 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 138 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"