diff options
| author | callum <none@none> | 2010-06-10 16:58:02 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-06-10 16:58:02 -0700 |
| commit | fc6d238884f06951a413004b46569304a9d9280a (patch) | |
| tree | 106a4f3e8a3b011d34a97b215070d5cd0a96c069 /indra/newview/llinventorybridge.h | |
| parent | 63577b8fe3f2b46da70e373364028ae45faf4e06 (diff) | |
| parent | 1065cce5e9db1bd18c2b485024ad360e48cedee2 (diff) | |
Default merge
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index a342a2da14..d97dfd535e 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -245,7 +245,7 @@ public: virtual LLFolderType::EType getPreferredType() const; virtual LLUIImagePtr getIcon() const; virtual LLUIImagePtr getOpenIcon() const; - static LLUIImagePtr getIcon(LLFolderType::EType preferred_type, BOOL is_link = FALSE); + static LLUIImagePtr getIcon(LLFolderType::EType preferred_type); virtual BOOL renameItem(const std::string& new_name); |