livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes from Oz's merge.

master
Aura Linden 2012-12-13 18:27:32 -08:00
parent 8e99b82645
commit 3a72577f39
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llvfs/lldir_mac.cpp
View File

@ -77,7 +77,9 @@ LLDir_Mac::LLDir_Mac()
boost::filesystem::path executablepath(*executablepathstr);
mExecutableFilename = executablepath.filename();
# ifndef BOOST_SYSTEM_NO_DEPRECATED
#endif
mExecutableFilename = executablepath.filename().string();
mExecutableDir = executablepath.parent_path().string();
// mAppRODataDir

4
indra/mac_updater/mac_updater.cpp
View File

@ -197,7 +197,7 @@ bool LLMacUpdater::findAppBundleOnDiskImage(const boost::filesystem::path& dir_p
{
if ( boost::filesystem::is_directory(itr->status()) )
{
std::string dir_name = itr->string();
std::string dir_name = itr->path().string();
if ( isApplication(dir_name) )
{
if(isFSRefViewerBundle(dir_name))
@ -399,7 +399,7 @@ bool LLMacUpdater::moveApplication (const boost::filesystem::path& app_dir,
//Grab filename from installdir append to tempdir move set aside_dir to moved path.
std::string install_str = app_dir.parent_path().string();
std::string temp_str = temp_dir.string();
std::string app_str = app_dir.filename();
std::string app_str = app_dir.filename().string();
aside_dir = boost::filesystem::path( boost::filesystem::operator/(temp_dir,app_str) );
std::cout << "Attempting to move " << app_dir.string() << " to " << aside_dir.string() << std::endl;