aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llvfs/lldir.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-06-14 12:04:49 +0200
committerArmin Weatherwax2010-09-23 15:38:25 +0200
commit35df5441d3e2789663532c948731aff3a1e04728 (patch)
treeac7674289784a5f96106ea507637055a8dada78a /linden/indra/llvfs/lldir.cpp
parentChanged version to Experimental 2010.09.18 (diff)
downloadmeta-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.cpp6
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
297const std::string &LLDir::getLLPluginDir() const
298{
299 return mLLPluginDir;
300}
297 301
298std::string LLDir::getExpandedFilename(ELLPath location, const std::string& filename) const 302std::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
466std::string LLDir::getExtension(const std::string& filepath) const 470std::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);