1 files changed, 36 insertions, 9 deletions

diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 0cdfe83..fe42608 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -97,6 +97,26 @@ const char AGENT_SUFFIX[] = " (resident)";
 const char OBJECT_SUFFIX[] = " (object)";
 const char GROUP_SUFFIX[] = " (group)";
 
+
+LLMute::LLMute(const LLUUID& id, const std::string& name, EType type, U32 flags)
+  : mID(id),
+        mName(name),
+        mType(type),
+        mFlags(flags)
+{
+        // muting is done by root objects only - try to find this objects root
+        LLViewerObject *objectp = gObjectList.findObject(mID);
+        if ((objectp) && (!objectp->isAvatar()))
+        {
+                LLViewerObject *parentp = (LLViewerObject *)objectp->getParent();
+                if (parentp)
+                {
+                        mID = parentp->getID();
+                }
+        }
+}
+
+
 std::string LLMute::getDisplayName() const
 {
         std::string name_with_suffix = mName;
@@ -216,17 +236,24 @@ void LLMuteList::loadUserVolumes()
 //-----------------------------------------------------------------------------
 LLMuteList::~LLMuteList()
 {
-        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml");
-        LLSD settings_llsd;
-
-        for(user_volume_map_t::iterator iter = mUserVolumeSettings.begin(); iter != mUserVolumeSettings.end(); ++iter)
+        // If we quit from the login screen we will not have an SL account
+        // name.  Don't try to save, otherwise we'll dump a file in
+        // C:\Program Files\SecondLife\  JC
+        std::string user_dir = gDirUtilp->getLindenUserDir();
+        if (!user_dir.empty())
         {
-                settings_llsd[iter->first.asString()] = iter->second;
-        }
+                std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml");
+                LLSD settings_llsd;
 
-        llofstream file;
-        file.open(filename);
-        LLSDSerialize::toPrettyXML(settings_llsd, file);
+                for(user_volume_map_t::iterator iter = mUserVolumeSettings.begin(); iter != mUserVolumeSettings.end(); ++iter)
+                {
+                        settings_llsd[iter->first.asString()] = iter->second;
+                }
+
+                llofstream file;
+                file.open(filename);
+                LLSDSerialize::toPrettyXML(settings_llsd, file);
+        }
 }
 
 BOOL LLMuteList::isLinden(const std::string& name) const