diff options
author | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:27 -0500 |
commit | a8a62201ba762e98dff92cf49033e577fc34d8d4 (patch) | |
tree | 11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/newview/llmutelist.h | |
parent | Second Life viewer sources 1.18.6.4-RC (diff) | |
download | meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2 meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz |
Second Life viewer sources 1.19.0.0
Diffstat (limited to 'linden/indra/newview/llmutelist.h')
-rw-r--r-- | linden/indra/newview/llmutelist.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h index aa3afad..fa85924 100644 --- a/linden/indra/newview/llmutelist.h +++ b/linden/indra/newview/llmutelist.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -112,6 +112,9 @@ public: | |||
112 | // call this method on logout to save everything. | 112 | // call this method on logout to save everything. |
113 | void cache(const LLUUID& agent_id); | 113 | void cache(const LLUUID& agent_id); |
114 | 114 | ||
115 | void setSavedResidentVolume(const LLUUID& id, F32 volume); | ||
116 | F32 getSavedResidentVolume(const LLUUID& id); | ||
117 | |||
115 | private: | 118 | private: |
116 | BOOL loadFromFile(const LLString& filename); | 119 | BOOL loadFromFile(const LLString& filename); |
117 | BOOL saveToFile(const LLString& filename); | 120 | BOOL saveToFile(const LLString& filename); |
@@ -155,6 +158,9 @@ private: | |||
155 | BOOL mIsLoaded; | 158 | BOOL mIsLoaded; |
156 | 159 | ||
157 | friend class LLDispatchEmptyMuteList; | 160 | friend class LLDispatchEmptyMuteList; |
161 | |||
162 | typedef std::map<LLUUID, F32> user_volume_map_t; | ||
163 | static user_volume_map_t sUserVolumeSettings; | ||
158 | }; | 164 | }; |
159 | 165 | ||
160 | class LLMuteListObserver | 166 | class LLMuteListObserver |