aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-10-11 12:09:51 -0700
committerMcCabe Maxsted2010-10-11 12:09:51 -0700
commit20216aa789b2ad02d924ee33b3cd901b6692b179 (patch)
tree0fce784d1039b171449b5670d3726f011e9d7442
parentRemoved a little piece of test code (diff)
downloadmeta-impy-20216aa789b2ad02d924ee33b3cd901b6692b179.zip
meta-impy-20216aa789b2ad02d924ee33b3cd901b6692b179.tar.gz
meta-impy-20216aa789b2ad02d924ee33b3cd901b6692b179.tar.bz2
meta-impy-20216aa789b2ad02d924ee33b3cd901b6692b179.tar.xz
Experimental only: changed Experimental cache folder to ImprudenceExperimental and settings file to settings_imprudence_experimental.xml
-rw-r--r--linden/indra/llvfs/lldir.cpp2
-rw-r--r--linden/indra/newview/llappviewer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index af55593..2c3c5f7 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -247,7 +247,7 @@ std::string LLDir::buildSLOSCacheDir() const
247 } 247 }
248 else 248 else
249 { 249 {
250 res = getOSCacheDir() + mDirDelimiter + "Imprudence"; 250 res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental";
251 } 251 }
252 return res; 252 return res;
253} 253}
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 76488fb..4806dda 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1809,7 +1809,7 @@ bool LLAppViewer::initConfiguration()
1809 // - set procedural settings 1809 // - set procedural settings
1810 gSavedSettings.setString("ClientSettingsFile", 1810 gSavedSettings.setString("ClientSettingsFile",
1811 // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); 1811 // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
1812 gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml")); 1812 gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence_experimental.xml"));
1813 1813
1814 gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName()); 1814 gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName());
1815 1815