aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2010-03-15 17:23:35 +0000
committerMelanie2010-03-15 17:23:35 +0000
commitd3f33acc1a6a385ee19814286fe27cb5e48c1551 (patch)
tree07795e74a637ca63d96b5ee06950b8c1a7a99489 /bin/OpenSim.ini.example
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentflip UVs for profile faces (diff)
downloadopensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.zip
opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.gz
opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.bz2
opensim-SC_OLD-d3f33acc1a6a385ee19814286fe27cb5e48c1551.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1a6059f..8d7c2cf 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1263,6 +1263,7 @@
1263 ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini" 1263 ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
1264 ;Include-Grid = "config-include/Grid.ini" 1264 ;Include-Grid = "config-include/Grid.ini"
1265 ;Include-HGGrid = "config-include/GridHypergrid.ini" 1265 ;Include-HGGrid = "config-include/GridHypergrid.ini"
1266 ;Include-SimianGrid = "config-include/SimianGrid.ini"
1266 1267
1267 ; Then choose 1268 ; Then choose
1268 ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR 1269 ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR