From ed4b37906749dd7ba2da56af741f2c0826f222d1 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 24 Jul 2012 12:11:20 -0700 Subject: Eliminated countFilesInDir boostified getCurPath for OSX --- indra/llvfs/lldir_mac.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llvfs/lldir_mac.h') diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index d190d70be4..9f1938ae23 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -45,7 +45,6 @@ public: const std::string& app_read_only_data_dir); virtual std::string getCurPath(); - virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); virtual BOOL fileExists(const std::string &filename) const; /*virtual*/ std::string getLLPluginLauncher(); -- cgit v1.2.3 From 3b560d4c4902eff361ac308f56d982b1147739c4 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 25 Jul 2012 16:03:50 -0700 Subject: Some cocoa that doesn't work --- indra/llvfs/lldir_mac.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/llvfs/lldir_mac.h') diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 9f1938ae23..b8b9c6a9e7 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -49,11 +49,6 @@ public: /*virtual*/ std::string getLLPluginLauncher(); /*virtual*/ std::string getLLPluginFilename(std::string base_name); - -private: - int mCurrentDirIndex; - int mCurrentDirCount; - std::string mCurrentDir; }; #endif // LL_LLDIR_MAC_H -- cgit v1.2.3 From 1154d5afde0730b541716587ca3c5b962dba1b8d Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 25 Jul 2012 16:08:27 -0700 Subject: Reverted boost/cocoa changes to purely Mountain Lion fixes. --- indra/llvfs/lldir_mac.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/llvfs/lldir_mac.h') diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index b8b9c6a9e7..64e9485757 100644 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h @@ -22,7 +22,7 @@ * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ - */ + */ #if !LL_DARWIN #error This header must not be included when compiling for any target other than Mac OS. Consider including lldir.h instead. @@ -45,10 +45,16 @@ public: const std::string& app_read_only_data_dir); virtual std::string getCurPath(); + virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask); virtual BOOL fileExists(const std::string &filename) const; /*virtual*/ std::string getLLPluginLauncher(); /*virtual*/ std::string getLLPluginFilename(std::string base_name); + +private: + int mCurrentDirIndex; + int mCurrentDirCount; + std::string mCurrentDir; }; #endif // LL_LLDIR_MAC_H -- cgit v1.2.3