diff options
| author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
| commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llmutelist.h | |
| parent | 1.1 version final (diff) | |
| parent | Merge branch 'sl-base-1.22' into next (diff) | |
| download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz | |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/llmutelist.h')
| -rw-r--r-- | linden/indra/newview/llmutelist.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h index d66dd17..ba1ffeb 100644 --- a/linden/indra/newview/llmutelist.h +++ b/linden/indra/newview/llmutelist.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2003-2008, Linden Research, Inc. | 7 | * Copyright (c) 2003-2009, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -60,8 +60,7 @@ public: | |||
| 60 | flagAll = 0x0000000F // Mask of all currently defined flags | 60 | flagAll = 0x0000000F // Mask of all currently defined flags |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | LLMute(const LLUUID& id, const std::string& name = std::string(), EType type = BY_NAME, U32 flags = 0) | 63 | LLMute(const LLUUID& id, const std::string& name = std::string(), EType type = BY_NAME, U32 flags = 0); |
| 64 | : mID(id), mName(name), mType(type),mFlags(flags) { } | ||
| 65 | 64 | ||
| 66 | // Returns name + suffix based on type | 65 | // Returns name + suffix based on type |
| 67 | // For example: "James Tester (resident)" | 66 | // For example: "James Tester (resident)" |