diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 10:36:27 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 10:36:27 -0800 |
| commit | 3d771ed88b1f40ca0a5869530d729a58000ef028 (patch) | |
| tree | aabf54705b60159d791944019dcc48c79b1ed0ff /indra/newview/llviewerinventory.h | |
| parent | 020f855f643a198737e7bd4066bdc1757d864a54 (diff) | |
| parent | d72748a0af3e77de9a5dfedd2b8c9d87bfe7da24 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 917b8747ea..7f3f019b07 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -58,7 +58,6 @@ public: protected: ~LLViewerInventoryItem( void ); // ref counted BOOL extractSortFieldAndDisplayName(S32* sortField, std::string* displayName) const { return extractSortFieldAndDisplayName(mName, sortField, displayName); } - static char getSeparator() { return '@'; } mutable std::string mDisplayName; public: @@ -67,6 +66,7 @@ public: virtual const std::string& getName() const; virtual const std::string& getDisplayName() const; static std::string getDisplayName(const std::string& name); + static char getSeparator() { return '@'; } virtual S32 getSortField() const; virtual void setSortField(S32 sortField); virtual void rename(const std::string& new_name); |