diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
| commit | a3f3ab7e113e44309461b26399d627814f0ce4f9 (patch) | |
| tree | 695b2a41f8d31330634ef59e7d6ece526242fd86 /indra/llui/lllineeditor.h | |
| parent | d85247e63e5ff0b488211b62429a4895b48dee27 (diff) | |
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
Diffstat (limited to 'indra/llui/lllineeditor.h')
| -rw-r--r-- | indra/llui/lllineeditor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 687e98e377..f5d7ecd4c4 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -305,7 +305,7 @@ protected: private: // Utility on top of LLUI::getUIImage, looks up a named image in a given XML node and returns it if possible // or returns a given default image if anything in the process fails. - static LLPointer<LLUIImage> LLLineEditor::parseImage(LLString name, LLXMLNodePtr from, LLPointer<LLUIImage> def); + static LLPointer<LLUIImage> parseImage(LLString name, LLXMLNodePtr from, LLPointer<LLUIImage> def); // Global instance used as default for member instance below. static LLPointer<LLUIImage> sImage; // Instances that by default point to the statics but can be overidden in XML. |