Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git into sunshine

Browse Source
This commit is contained in:
Shyotl
2013-01-08 17:06:08 -06:00
parent 54771409d6 cd27184332
commit 7ca974f731
20 changed files with 190 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llstartup.cpp
View File

@@ -1064,7 +1064,7 @@ bool idle_startup()
gSavedSettings.getControl("_NACL_AntiSpamAmount")->getSignal()->connect(boost::bind(&NACLAntiSpamRegistry::handleNaclAntiSpamAmountChanged, _2));
// NaCl End
//good as place as any to create user windlight directories
//good a place as any to create user windlight directories
std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", ""));
LLFile::mkdir(user_windlight_path_name.c_str());