aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOren Hurvitz2014-07-14 10:55:13 +0300
committerJustin Clark-Casey2014-08-02 00:57:11 +0100
commit4514799c8d4fd3fc36fa3d90fdd36f786a4387ed (patch)
treee168ef5b3c216d9281e3b8c186018b8b4deef5ad
parentXBakes: store the assets only in the sim's local assets cache; not in the mai... (diff)
downloadopensim-SC_OLD-4514799c8d4fd3fc36fa3d90fdd36f786a4387ed.zip
opensim-SC_OLD-4514799c8d4fd3fc36fa3d90fdd36f786a4387ed.tar.gz
opensim-SC_OLD-4514799c8d4fd3fc36fa3d90fdd36f786a4387ed.tar.bz2
opensim-SC_OLD-4514799c8d4fd3fc36fa3d90fdd36f786a4387ed.tar.xz
Changed the default XBakes directory to a local path: "./bakes".
Previously it was an absolute path. Now it's a sibling of the maptiles directory. This fixes http://opensimulator.org/mantis/view.php?id=7063
-rw-r--r--.gitignore1
-rw-r--r--bin/Robust.HG.ini.example5
-rw-r--r--bin/Robust.ini.example5
3 files changed, 5 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index aa3e024..b495ed1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ bin/Regions/*
54bin/UserAssets 54bin/UserAssets
55bin/assetcache 55bin/assetcache
56bin/maptiles 56bin/maptiles
57bin/bakes
57bin/estate_settings.xml 58bin/estate_settings.xml
58bin/config-include/CenomeCache.ini 59bin/config-include/CenomeCache.ini
59bin/config-include/FlotsamCache.ini 60bin/config-include/FlotsamCache.ini
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index aaa78ff..5474436 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -656,6 +656,5 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
656 656
657[BakedTextureService] 657[BakedTextureService]
658 LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes" 658 LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
659 ;; This directory must exist and be writable for the user ROBUST runs as 659 ;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
660 BaseDirectory = "/data/bakes" 660 BaseDirectory = "./bakes"
661
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 203c0e0..14c66a0 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -465,9 +465,8 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
465 UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService 465 UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
466 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 466 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
467 467
468
469[BakedTextureService] 468[BakedTextureService]
470 LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes" 469 LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
471 ;; This directory must exist and be writable for the user ROBUST runs as 470 ;; This directory must be writable by the user ROBUST runs as. It will be created automatically.
472 BaseDirectory = "/data/bakes" 471 BaseDirectory = "./bakes"
473 472