diff options
author | Richard Linden <none@none> | 2010-06-24 10:47:31 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-06-24 10:47:31 -0700 |
commit | 483f66e082dd758ac1efafdcb5ba9c277690d760 (patch) | |
tree | 2e6f5c10c08e9bdf7caa11c31a40d6a3e9792ff4 /indra/llui/lluictrlfactory.h | |
parent | 8f892d0f36fda170a5cecf0aea89887d6d0e45ef (diff) | |
parent | 1683c7c6e99814e101312aad38718d393a2605e3 (diff) |
merge
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
-rw-r--r-- | indra/llui/lluictrlfactory.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index b1fa6add67..7da96ffce3 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -170,7 +170,9 @@ public: // Returns 0 on success S32 saveToXML(LLView* viewp, const std::string& filename); - std::string getCurFileName() { return mFileNames.empty() ? "" : mFileNames.back(); } + std::string getCurFileName(); + void pushFileName(const std::string& name); + void popFileName(); static BOOL getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color); @@ -229,7 +231,7 @@ public: T* widget = NULL; std::string skinned_filename = findSkinnedFilename(filename); - getInstance()->mFileNames.push_back(skinned_filename); + instance().pushFileName(filename); { LLXMLNodePtr root_node; @@ -263,7 +265,7 @@ public: } } fail: - getInstance()->mFileNames.pop_back(); + instance().popFileName(); return widget; } |