summaryrefslogtreecommitdiff
path: root/indra/newview/llmutelist.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-26 12:52:44 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-26 12:52:44 -0800
commit2795661869e3dbbfe1e6becec1d6bb3635eafd3b (patch)
treec5f090db2907c0904bb6436b894761e82b10349d /indra/newview/llmutelist.h
parent22bcd0e0eaeda849fbb1a8ecd78eeee7a219c614 (diff)
parent92f5e24c58f4a33e237c327c5266bb5fab6f9531 (diff)
Merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/llmutelist.h')
-rw-r--r--indra/newview/llmutelist.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h
index 409b637bf2..e1e81a24b4 100644
--- a/indra/newview/llmutelist.h
+++ b/indra/newview/llmutelist.h
@@ -127,12 +127,7 @@ public:
// call this method on logout to save everything.
void cache(const LLUUID& agent_id);
- void setSavedResidentVolume(const LLUUID& id, F32 volume);
- F32 getSavedResidentVolume(const LLUUID& id);
-
private:
- void loadUserVolumes();
-
BOOL loadFromFile(const std::string& filename);
BOOL saveToFile(const std::string& filename);
@@ -179,12 +174,8 @@ private:
observer_set_t mObservers;
BOOL mIsLoaded;
- BOOL mUserVolumesLoaded;
friend class LLDispatchEmptyMuteList;
-
- typedef std::map<LLUUID, F32> user_volume_map_t;
- user_volume_map_t mUserVolumeSettings;
};
class LLMuteListObserver