aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2010-05-31 17:57:48 +0100
committerMelanie2010-05-31 17:57:48 +0100
commit0526a91206a64cb43be29d61d472a98f5a031b74 (patch)
tree061ab41ebe056e48794de5fd296c8af576471c1e /bin/config-include
parentFix casting in llParcelMediaCommandList so that it actually, you know, works (diff)
parentFix a nullref in EventManager caused by RegionReady not setting the scene (diff)
downloadopensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.zip
opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.gz
opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.bz2
opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.xz
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to '')
-rw-r--r--bin/config-include/GridCommon.ini.example6
1 files changed, 1 insertions, 5 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 8fc2425..cc86501 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,16 +15,12 @@
15 ; 15 ;
16 InventoryServerURI = "http://myinventoryserver.com:8003" 16 InventoryServerURI = "http://myinventoryserver.com:8003"
17 17
18
18[GridService] 19[GridService]
19 ; 20 ;
20 ; change this to your grid-wide grid server 21 ; change this to your grid-wide grid server
21 ; 22 ;
22 GridServerURI = "http://mygridserver.com:8003" 23 GridServerURI = "http://mygridserver.com:8003"
23[Groups]
24 ;
25 ; change this to your grid-wide groups server
26 ;
27 GroupsServerURI = "http://mygridserver.com:82/Grid/"
28 24
29 25
30[Modules] 26[Modules]