diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
| commit | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (patch) | |
| tree | d746c96bab1bfd44c6373926608e91c0f2fd9e49 /indra/llfilesystem/lldir.h | |
| parent | eab232d3ed49bfb1f873e332ff57ec8c311c163b (diff) | |
| parent | 6d6eabca44d08d5b97bfe3e941d2b9687c2246ea (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/llfilesystem/lldir.h')
| -rw-r--r-- | indra/llfilesystem/lldir.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llfilesystem/lldir.h b/indra/llfilesystem/lldir.h index d43921c292..b9a046ba33 100644 --- a/indra/llfilesystem/lldir.h +++ b/indra/llfilesystem/lldir.h @@ -72,8 +72,6 @@ class LLDir // pure virtual functions virtual std::string getCurPath() = 0; virtual bool fileExists(const std::string &filename) const = 0; - virtual bool skinExists(const std::string& subdir, const std::string &skin) const; - virtual std::string getFileContents(const std::string& filename) const; const std::string findFile(const std::string& filename, const std::vector<std::string> filenames) const; const std::string findFile(const std::string& filename, const std::string& searchPath1 = "", const std::string& searchPath2 = "", const std::string& searchPath3 = "") const; @@ -152,7 +150,7 @@ class LLDir const std::string& filename, ESkinConstraint constraint=CURRENT_SKIN) const; /// Values for findSkinnedFilenames(subdir) parameter - static const char *XUI, *HTML, *TEXTURES, *SKINBASE; + static const char *XUI, *TEXTURES, *SKINBASE; /** * Return the base-language pathname from findSkinnedFilenames(), or * the empty string if no such file exists. Parameters are identical to |