From 926ea0b39afd04cab469ca17b28f95ebf969e669 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 27 Jun 2008 21:02:01 +0000 Subject: QAR-669 1.20 Viewer RC11 QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release --- indra/newview/llmutelist.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llmutelist.h') diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h index cc6f5c9762..c1b887b877 100644 --- a/indra/newview/llmutelist.h +++ b/indra/newview/llmutelist.h @@ -131,6 +131,8 @@ public: F32 getSavedResidentVolume(const LLUUID& id); private: + void loadUserVolumes(); + BOOL loadFromFile(const std::string& filename); BOOL saveToFile(const std::string& filename); @@ -171,11 +173,12 @@ private: observer_set_t mObservers; BOOL mIsLoaded; + BOOL mUserVolumesLoaded; friend class LLDispatchEmptyMuteList; typedef std::map user_volume_map_t; - static user_volume_map_t sUserVolumeSettings; + user_volume_map_t mUserVolumeSettings; }; class LLMuteListObserver -- cgit v1.2.3