diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:52:44 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 12:52:44 -0800 |
| commit | 2795661869e3dbbfe1e6becec1d6bb3635eafd3b (patch) | |
| tree | c5f090db2907c0904bb6436b894761e82b10349d /indra/newview/llviewerinventory.h | |
| parent | 22bcd0e0eaeda849fbb1a8ecd78eeee7a219c614 (diff) | |
| parent | 92f5e24c58f4a33e237c327c5266bb5fab6f9531 (diff) | |
Merge from viewer2 trunk.
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); |