diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-03-18 19:22:30 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-03-18 19:22:30 +0200 |
commit | 2f9223dc1472dace57095be1ba0a88e4e0e53695 (patch) | |
tree | 3d871c2e5fec49ec1700a0c88fdd80670bb15044 /indra/newview/llmutelist.h | |
parent | 2b7a6f932591d5d8498594d12d56113eb954d92c (diff) | |
parent | 155072934832baf42a0dd01f1d898ccad4782a11 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llmutelist.h')
-rw-r--r-- | indra/newview/llmutelist.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h index e1e81a24b4..7cb11e6031 100644 --- a/indra/newview/llmutelist.h +++ b/indra/newview/llmutelist.h @@ -63,14 +63,8 @@ public: LLMute(const LLUUID& id, const std::string& name = std::string(), EType type = BY_NAME, U32 flags = 0); - // Returns name + suffix based on type - // For example: "James Tester (resident)" - std::string getDisplayName() const; - - // Converts a UI name into just the agent or object name - // For example: "James Tester (resident)" sets the name to "James Tester" - // and the type to AGENT. - void setFromDisplayName(const std::string& display_name); + // Returns localized type name of muted item + std::string getDisplayType() const; public: LLUUID mID; // agent or object id |