aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2011-02-19 01:59:49 +0000
committerMelanie2011-02-19 01:59:49 +0000
commit4834b476798cce715d0b5b286a6f20bc577bdabd (patch)
tree5bf15fa7978daaff116147838f84e4915bca1777 /bin
parentAdd needed dummy to sample money (diff)
parentRemove test T020_TestMakeRootAgent() which hasn't been active for ages anyway (diff)
downloadopensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.zip
opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.gz
opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.bz2
opensim-SC-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--bin/Robust.HG.ini.example2
-rw-r--r--bin/config-include/GridCommon.ini.example2
-rw-r--r--bin/config-include/StandaloneCommon.ini.example2
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 9adf1ac..f12a143 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -72,7 +72,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
72 AssetService = "OpenSim.Services.AssetService.dll:AssetService" 72 AssetService = "OpenSim.Services.AssetService.dll:AssetService"
73 73
74 ;; Directory for map tile images of linked regions 74 ;; Directory for map tile images of linked regions
75 ; MapTileDirectory = "./" 75 ; MapTileDirectory = "./maptiles"
76 76
77 ;; Next, we can specify properties of regions, including default and fallback regions 77 ;; Next, we can specify properties of regions, including default and fallback regions
78 ;; The syntax is: Region_<RegionName> = "<flags>" 78 ;; The syntax is: Region_<RegionName> = "<flags>"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e1bcf00..4dc0e53 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -43,7 +43,7 @@
43 ;AllowHypergridMapSearch = true 43 ;AllowHypergridMapSearch = true
44 44
45 ;; Directory for map tile images of linked regions 45 ;; Directory for map tile images of linked regions
46 ; MapTileDirectory = "./" 46 ; MapTileDirectory = "./maptiles"
47 47
48[AvatarService] 48[AvatarService]
49 ; 49 ;
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 213219c..816e9a6 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -70,7 +70,7 @@
70 ; Check4096 = true 70 ; Check4096 = true
71 71
72 ;; Directory for map tile images of remote regions 72 ;; Directory for map tile images of remote regions
73 ; MapTileDirectory = "./" 73 ; MapTileDirectory = "./maptiles"
74 74
75 ;; Next, we can specify properties of regions, including default and fallback regions 75 ;; Next, we can specify properties of regions, including default and fallback regions
76 ;; The syntax is: Region_<RegioName> = "<flags>" 76 ;; The syntax is: Region_<RegioName> = "<flags>"