diff options
author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/llvfs/lldir.cpp | |
parent | Changed version to Experimental 2010.09.18 (diff) | |
download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz |
llmediaplugins first step
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llvfs/lldir.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp index af55593..5567fdd 100644 --- a/linden/indra/llvfs/lldir.cpp +++ b/linden/indra/llvfs/lldir.cpp | |||
@@ -294,6 +294,10 @@ const std::string LLDir::getSkinBaseDir() const | |||
294 | return dir; | 294 | return dir; |
295 | } | 295 | } |
296 | 296 | ||
297 | const std::string &LLDir::getLLPluginDir() const | ||
298 | { | ||
299 | return mLLPluginDir; | ||
300 | } | ||
297 | 301 | ||
298 | std::string LLDir::getExpandedFilename(ELLPath location, const std::string& filename) const | 302 | std::string LLDir::getExpandedFilename(ELLPath location, const std::string& filename) const |
299 | { | 303 | { |
@@ -465,6 +469,8 @@ std::string LLDir::getDirName(const std::string& filepath) const | |||
465 | 469 | ||
466 | std::string LLDir::getExtension(const std::string& filepath) const | 470 | std::string LLDir::getExtension(const std::string& filepath) const |
467 | { | 471 | { |
472 | if (filepath.empty()) | ||
473 | return std::string(); | ||
468 | std::string basename = getBaseFileName(filepath, false); | 474 | std::string basename = getBaseFileName(filepath, false); |
469 | std::size_t offset = basename.find_last_of('.'); | 475 | std::size_t offset = basename.find_last_of('.'); |
470 | std::string exten = (offset == std::string::npos || offset == 0) ? "" : basename.substr(offset+1); | 476 | std::string exten = (offset == std::string::npos || offset == 0) ? "" : basename.substr(offset+1); |