aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-05-21 03:03:35 +0100
committerMelanie2010-05-21 03:03:35 +0100
commitb6674c9b7676aa522a4cc5201a6035d89e138655 (patch)
tree1c047eb52906800973ed00e151bb72be5ca91fa5 /bin
parentInitialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo w... (diff)
parentMerge branch '0.6.9-post-fixes' into careminster (diff)
downloadopensim-SC_OLD-b6674c9b7676aa522a4cc5201a6035d89e138655.zip
opensim-SC_OLD-b6674c9b7676aa522a4cc5201a6035d89e138655.tar.gz
opensim-SC_OLD-b6674c9b7676aa522a4cc5201a6035d89e138655.tar.bz2
opensim-SC_OLD-b6674c9b7676aa522a4cc5201a6035d89e138655.tar.xz
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example1
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f318a2d..e67c8bd 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1191,7 +1191,6 @@
1191 1191
1192 ; Service connector to Groups Service [Select One] ServicesConnectorModule 1192 ; Service connector to Groups Service [Select One] ServicesConnectorModule
1193 1193
1194
1195 ; Simian Grid Service for Groups 1194 ; Simian Grid Service for Groups
1196 ;ServicesConnectorModule = SimianGroupsServicesConnector 1195 ;ServicesConnectorModule = SimianGroupsServicesConnector
1197 ;GroupsServerURI = http://mygridserver.com:82/Grid/ 1196 ;GroupsServerURI = http://mygridserver.com:82/Grid/