diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 192fc58e23..d797315272 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17968,15 +17968,13 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>DebugWebRTCRequireEstablishedSpatialSession</key>
     <map>
       <key>Comment</key>
-      <string>Test for FIRE-36672</string>
+      <string>Only report proximal channel when a spatial session is established (FIRE-36672)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
-      <key>Backup</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>VivoxVoiceHost</key>
     <map>
diff --git a/indra/newview/fsfloatergrouptitles.cpp b/indra/newview/fsfloatergrouptitles.cpp
index 7334d852cf..3629a0f848 100644
--- a/indra/newview/fsfloatergrouptitles.cpp
+++ b/indra/newview/fsfloatergrouptitles.cpp
@@ -106,7 +106,8 @@ bool FSFloaterGroupTitles::postBuild()
     mSetRegionButton = getChild<LLButton>("btnSetRegion");
     mSetRegionManualButton = getChild<LLButton>("btnSetRegionManual");
     mClearRegionButton = getChild<LLButton>("btnClearRegion");
-    mNoneOnUnassigned = getChild<LLCheckBoxCtrl>("none_on_unassigned");
+    mSetDefaultButton = getChild<LLButton>("btnSetDefault");
+    mUseDefaultCheck = getChild<LLCheckBoxCtrl>("use_default_title");
     mTitleList = getChild<LLScrollListCtrl>("title_list");
     mFilterEditor = getChild<LLFilterEditor>("filter_input");
 
@@ -116,19 +117,21 @@ bool FSFloaterGroupTitles::postBuild()
     mSetRegionButton->setCommitCallback(boost::bind(&FSFloaterGroupTitles::onSetRegion, this));
     mSetRegionManualButton->setCommitCallback(boost::bind(&FSFloaterGroupTitles::onSetRegionManual, this));
     mClearRegionButton->setCommitCallback(boost::bind(&FSFloaterGroupTitles::onClearRegion, this));
-    mNoneOnUnassigned->setCommitCallback(boost::bind(&FSFloaterGroupTitles::onNoneOnUnassignedToggle, this));
+    mSetDefaultButton->setCommitCallback(boost::bind(&FSFloaterGroupTitles::onSetAsDefault, this));
+    mUseDefaultCheck->setCommitCallback(boost::bind(&FSFloaterGroupTitles::onUseDefaultToggle, this));
     mTitleList->setDoubleClickCallback(boost::bind(&FSFloaterGroupTitles::activateGroupTitle, this));
     mTitleList->setCommitCallback(boost::bind(&FSFloaterGroupTitles::selectedTitleChanged, this));
     mFilterEditor->setCommitCallback(boost::bind(&FSFloaterGroupTitles::onFilterEdit, this, _2));
 
-    mNoneOnUnassigned->set(FSGroupTitleRegionMgr::getInstance()->getNoneOnUnassigned());
     mSetRegionButton->setEnabled(false);
     mSetRegionManualButton->setEnabled(false);
     mClearRegionButton->setEnabled(false);
+    mSetDefaultButton->setEnabled(false);
+    mUseDefaultCheck->set(FSGroupTitleRegionMgr::getInstance()->getEnabled());
     mAssignmentsChangedConnection = FSGroupTitleRegionMgr::getInstance()->setAssignmentsChangedCallback([this]() { updateRegionColumn(); });
 
     mTitleList->sortByColumn("title_sort_column", true);
-    mTitleList->setFilterColumn(0);
+    mTitleList->setFilterColumn(mTitleList->getColumn("filter_text")->mIndex);
 
     refreshGroupTitles();
 
@@ -219,6 +222,13 @@ void FSFloaterGroupTitles::addListItem(const LLUUID& group_id, const LLUUID& rol
     item["columns"][6]["column"] = "name_sort_column";
     item["columns"][6]["type"] = "text";
     item["columns"][6]["value"] = (is_group ? ("1_" + group_name) : "0");
+    item["columns"][7]["column"] = "filter_text";
+    item["columns"][7]["type"] = "text";
+    item["columns"][7]["value"] = title + " " + group_name + " " + region_name;
+    item["columns"][8]["column"] = "default_marker";
+    item["columns"][8]["type"] = "icon";
+    item["columns"][8]["halign"] = "center";
+    item["columns"][8]["value"] = LLStringUtil::null;
 
     mTitleList->addElement(item);
 
@@ -250,6 +260,7 @@ void FSFloaterGroupTitles::processGroupTitleResults(const LLGroupData& group_dat
     }
 
     mTitleList->scrollToShowSelected();
+    updateDefaultColumn();
 
     // Remove observer
     observer_map_t::iterator found_it = mGroupTitleObserverMap.find(group_data.mID);
@@ -297,6 +308,8 @@ void FSFloaterGroupTitles::refreshGroupTitles()
         mGroupTitleObserverMap[group_data.mID] = roleObserver;
         LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_data.mID);
     }
+
+    updateDefaultColumn();
 }
 
 void FSFloaterGroupTitles::selectedTitleChanged()
@@ -311,12 +324,14 @@ void FSFloaterGroupTitles::selectedTitleChanged()
         mSetRegionButton->setEnabled(true);
         mSetRegionManualButton->setEnabled(true);
         mClearRegionButton->setEnabled(has_region);
+        mSetDefaultButton->setEnabled(true);
     }
     else
     {
         mSetRegionButton->setEnabled(false);
         mSetRegionManualButton->setEnabled(false);
         mClearRegionButton->setEnabled(false);
+        mSetDefaultButton->setEnabled(false);
     }
 }
 
@@ -442,14 +457,65 @@ void FSFloaterGroupTitles::onClearRegion()
     menu->show(screen_x, screen_y, mClearRegionButton);
 }
 
-void FSFloaterGroupTitles::onNoneOnUnassignedToggle()
+void FSFloaterGroupTitles::onUseDefaultToggle()
 {
-    FSGroupTitleRegionMgr::getInstance()->setNoneOnUnassigned(mNoneOnUnassigned->get());
+    FSGroupTitleRegionMgr::getInstance()->setEnabled(mUseDefaultCheck->get());
+    updateDefaultColumn();
+}
+
+void FSFloaterGroupTitles::onSetAsDefault()
+{
+    LLScrollListItem* selected_item = mTitleList->getFirstSelected();
+    if (!selected_item)
+    {
+        return;
+    }
+    const LLUUID group_id = selected_item->getColumn(mTitleList->getColumn("group_id")->mIndex)->getValue().asUUID();
+    const LLUUID role_id  = selected_item->getColumn(mTitleList->getColumn("role_id")->mIndex)->getValue().asUUID();
+    auto* mgr = FSGroupTitleRegionMgr::getInstance();
+    mgr->setDefaultTitle(group_id, role_id);
+    mgr->setEnabled(true);
+    mUseDefaultCheck->set(true);
+    updateDefaultColumn();
+}
+
+void FSFloaterGroupTitles::updateDefaultColumn()
+{
+    LLScrollListColumn* default_col = mTitleList->getColumn("default_marker");
+    if (!default_col)
+    {
+        return;
+    }
+
+    const auto default_col_idx  = default_col->mIndex;
+    const auto group_id_col_idx = mTitleList->getColumn("group_id")->mIndex;
+    const auto role_id_col_idx  = mTitleList->getColumn("role_id")->mIndex;
+
+    auto* mgr = FSGroupTitleRegionMgr::getInstance();
+    const bool enabled = mgr->getEnabled();
+    const LLUUID default_group = mgr->getDefaultGroupID();
+    const LLUUID default_role = mgr->getDefaultRoleID();
+
+    for (auto* item : mTitleList->getAllData())
+    {
+        auto* cell = item->getColumn(default_col_idx);
+        if (!cell)
+        {
+            continue;
+        }
+        const LLUUID group_id = item->getColumn(group_id_col_idx)->getValue().asUUID();
+        const LLUUID role_id = item->getColumn(role_id_col_idx)->getValue().asUUID();
+        const bool is_default = enabled && group_id == default_group && role_id == default_role;
+        cell->setValue(is_default ? LLSD("Check_Mark") : LLSD(LLStringUtil::null));
+    }
 }
 
 void FSFloaterGroupTitles::updateRegionColumn()
 {
     const auto region_col_idx   = mTitleList->getColumn("regionname")->mIndex;
+    const auto title_col_idx    = mTitleList->getColumn("grouptitle")->mIndex;
+    const auto group_col_idx    = mTitleList->getColumn("groupname")->mIndex;
+    const auto filter_col_idx   = mTitleList->getColumn("filter_text")->mIndex;
     const auto group_id_col_idx = mTitleList->getColumn("group_id")->mIndex;
     const auto role_id_col_idx  = mTitleList->getColumn("role_id")->mIndex;
     auto* mgr = FSGroupTitleRegionMgr::getInstance();
@@ -457,10 +523,18 @@ void FSFloaterGroupTitles::updateRegionColumn()
     {
         const auto group_id = item->getColumn(group_id_col_idx)->getValue().asUUID();
         const auto role_id  = item->getColumn(role_id_col_idx)->getValue().asUUID();
+        const std::string region_name = mgr->getRegionForTitle(group_id, role_id);
 
         if (auto* cell = item->getColumn(region_col_idx))
         {
-            cell->setValue(mgr->getRegionForTitle(group_id, role_id));
+            cell->setValue(region_name);
+        }
+
+        if (auto* filter_cell = item->getColumn(filter_col_idx))
+        {
+            const std::string title = item->getColumn(title_col_idx)->getValue().asString();
+            const std::string group_name = item->getColumn(group_col_idx)->getValue().asString();
+            filter_cell->setValue(title + " " + group_name + " " + region_name);
         }
     }
 }
diff --git a/indra/newview/fsfloatergrouptitles.h b/indra/newview/fsfloatergrouptitles.h
index 50b0440d1d..782bcb80b0 100644
--- a/indra/newview/fsfloatergrouptitles.h
+++ b/indra/newview/fsfloatergrouptitles.h
@@ -85,7 +85,9 @@ private:
     void onSetRegion();
     void onSetRegionManual();
     void onClearRegion();
-    void onNoneOnUnassignedToggle();
+    void onUseDefaultToggle();
+    void onSetAsDefault();
+    void updateDefaultColumn();
     void updateRegionColumn();
 
     LLButton*           mActivateButton;
@@ -94,7 +96,8 @@ private:
     LLButton*           mSetRegionButton;
     LLButton*           mSetRegionManualButton;
     LLButton*           mClearRegionButton;
-    LLCheckBoxCtrl*     mNoneOnUnassigned;
+    LLButton*           mSetDefaultButton;
+    LLCheckBoxCtrl*     mUseDefaultCheck;
     LLScrollListCtrl*   mTitleList;
     LLFilterEditor*     mFilterEditor;
 
diff --git a/indra/newview/fsgrouptitleregionmgr.cpp b/indra/newview/fsgrouptitleregionmgr.cpp
index 2b84296bff..c537659338 100644
--- a/indra/newview/fsgrouptitleregionmgr.cpp
+++ b/indra/newview/fsgrouptitleregionmgr.cpp
@@ -92,7 +92,9 @@ void FSGroupTitleRegionMgr::loadFromDisk()
     }
 
     mAssignments.clear();
-    mNoneOnUnassigned = false;
+    mEnabled = false;
+    mDefaultGroupID.setNull();
+    mDefaultRoleID.setNull();
     mLastAppliedRegion.clear();
 
     const auto filename = getFilename();
@@ -120,7 +122,20 @@ void FSGroupTitleRegionMgr::loadFromDisk()
     }
     file.close();
 
-    mNoneOnUnassigned = data["none_on_unassigned"].asBoolean();
+    if (data.has("none_on_unassigned"))
+    {
+        mEnabled = data["none_on_unassigned"].asBoolean();
+    }
+
+    if (data.has("default_group_id"))
+    {
+        mDefaultGroupID = data["default_group_id"].asUUID();
+    }
+
+    if (data.has("default_role_id"))
+    {
+        mDefaultRoleID = data["default_role_id"].asUUID();
+    }
 
     if (data.has("assignments") && data["assignments"].isMap())
     {
@@ -175,7 +190,9 @@ void FSGroupTitleRegionMgr::saveToDisk()
     }
 
     LLSD data;
-    data["none_on_unassigned"] = mNoneOnUnassigned;
+    data["none_on_unassigned"] = mEnabled;
+    data["default_group_id"]   = mDefaultGroupID;
+    data["default_role_id"]    = mDefaultRoleID;
     data["assignments"]        = assignments;
 
     llofstream file(filename.c_str());
@@ -305,9 +322,24 @@ bool FSGroupTitleRegionMgr::getAssignmentForRegion(const std::string& region_nam
 // Preferences
 // ---------------------------------------------------------------------------
 
-void FSGroupTitleRegionMgr::setNoneOnUnassigned(bool enabled)
+void FSGroupTitleRegionMgr::setEnabled(bool enabled)
 {
-    mNoneOnUnassigned = enabled;
+    if (enabled == mEnabled)
+    {
+        return;
+    }
+    mEnabled = enabled;
+    saveToDisk();
+}
+
+void FSGroupTitleRegionMgr::setDefaultTitle(const LLUUID& group_id, const LLUUID& role_id)
+{
+    if (group_id == mDefaultGroupID && role_id == mDefaultRoleID)
+    {
+        return;
+    }
+    mDefaultGroupID = group_id;
+    mDefaultRoleID  = role_id;
     saveToDisk();
 }
 
@@ -483,6 +515,41 @@ void FSGroupTitleRegionMgr::onValidationTimeout()
 // Region change handler
 // ---------------------------------------------------------------------------
 
+void FSGroupTitleRegionMgr::applyGroupTitle(const LLUUID& group_id, const LLUUID& role_id)
+{
+    if (group_id.notNull() && !gAgent.isInGroup(group_id))
+    {
+        LL_WARNS() << "Requested group title belongs to a group we are no longer in, skipping" << LL_ENDL;
+        return;
+    }
+
+    bool title_already_active = false;
+    if (group_id.notNull())
+    {
+        if (const auto* group_data = LLGroupMgr::getInstance()->getGroupData(group_id))
+        {
+            for (const auto& title : group_data->mTitles)
+            {
+                if (title.mRoleID == role_id && title.mSelected)
+                {
+                    title_already_active = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (group_id.notNull() && !title_already_active)
+    {
+        LLGroupMgr::getInstance()->sendGroupTitleUpdate(group_id, role_id);
+    }
+
+    if (gAgent.getGroupID() != group_id)
+    {
+        LLGroupActions::activate(group_id);
+    }
+}
+
 void FSGroupTitleRegionMgr::onRegionChanged()
 {
     if (!mDataLoaded)
@@ -518,43 +585,16 @@ void FSGroupTitleRegionMgr::onRegionChanged()
     LLUUID role_id;
     if (getAssignmentForRegion(region_name, group_id, role_id))
     {
-        if (group_id.notNull() && !gAgent.isInGroup(group_id))
-        {
-            LL_WARNS() << "Region '" << region->getName() << "' has a title assignment for a group we are no longer in, skipping" << LL_ENDL;
-            return;
-        }
-
-        bool title_already_active = false;
-        if (group_id.notNull())
-        {
-            if (const auto* group_data = LLGroupMgr::getInstance()->getGroupData(group_id))
-            {
-                for (const auto& title : group_data->mTitles)
-                {
-                    if (title.mRoleID == role_id && title.mSelected)
-                    {
-                        title_already_active = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        LL_INFOS() << "Region '" << region->getName() << "', switching to assigned group title" << LL_ENDL;
-
-        if (group_id.notNull() && !title_already_active)
-        {
-            LLGroupMgr::getInstance()->sendGroupTitleUpdate(group_id, role_id);
-        }
-
-        if (gAgent.getGroupID() != group_id)
-        {
-            LLGroupActions::activate(group_id);
-        }
+        LL_DEBUGS() << "Region '" << region->getName() << "' has an assigned group title, applying it" << LL_ENDL;
+        applyGroupTitle(group_id, role_id);
+        return;
     }
-    else if (mNoneOnUnassigned && gAgent.getGroupID().notNull())
+
+    if (!mEnabled)
     {
-        LL_INFOS() << "Region '" << region->getName() << "' has no title preset, deactivating group" << LL_ENDL;
-        LLGroupActions::activate(LLUUID::null);
+        return;
     }
+
+    LL_DEBUGS() << "Region '" << region->getName() << "' is unassigned, applying default group title" << LL_ENDL;
+    applyGroupTitle(mDefaultGroupID, mDefaultRoleID);
 }
diff --git a/indra/newview/fsgrouptitleregionmgr.h b/indra/newview/fsgrouptitleregionmgr.h
index 70032b8478..913e3a35cd 100644
--- a/indra/newview/fsgrouptitleregionmgr.h
+++ b/indra/newview/fsgrouptitleregionmgr.h
@@ -59,8 +59,11 @@ public:
     std::string getRegionForTitle(const LLUUID& group_id, const LLUUID& role_id) const;
     std::vector<std::string> getRegionDisplayNamesForTitle(const LLUUID& group_id, const LLUUID& role_id) const;
     bool getAssignmentForRegion(const std::string& region_name, LLUUID& group_id, LLUUID& role_id) const;
-    void setNoneOnUnassigned(bool enabled);
-    bool getNoneOnUnassigned() const { return mNoneOnUnassigned; }
+    void setEnabled(bool enabled);
+    bool getEnabled() const { return mEnabled; }
+    void setDefaultTitle(const LLUUID& group_id, const LLUUID& role_id);
+    const LLUUID& getDefaultGroupID() const { return mDefaultGroupID; }
+    const LLUUID& getDefaultRoleID() const { return mDefaultRoleID; }
     void showRegionInputDialog(const LLUUID& group_id, const LLUUID& role_id);
     static std::string sanitizeRegionName(const std::string& input);
 
@@ -69,6 +72,7 @@ public:
 
 private:
     void validateAndSetAssignment(const LLUUID& group_id, const LLUUID& role_id, const std::string& region_name);
+    void applyGroupTitle(const LLUUID& group_id, const LLUUID& role_id);
     void onRegionChanged();
     void cancelPendingValidation();
     void onValidationResult(U64 region_handle);
@@ -76,7 +80,9 @@ private:
     std::string getFilename() const;
     static std::string normalizeRegionName(const std::string& name);
     static bool onRegionInputCallback(const LLSD& notification, const LLSD& response);
-    bool mNoneOnUnassigned = false;
+    bool mEnabled = false;
+    LLUUID mDefaultGroupID;
+    LLUUID mDefaultRoleID;
     bool mDataLoaded       = false;
     std::string mLastAppliedRegion;
 
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index ede91032c2..8349eb7d15 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -1569,7 +1569,7 @@ void LLWebRTCVoiceClient::processChannels(bool process)
 
 bool LLWebRTCVoiceClient::inProximalChannel()
 {
-    // <FS:PP> Test for FIRE-36672, disabled by default
+    // <FS:PP> FIRE-36672: Voice status indicator behavior change
     // inSpatialChannel() defaults to true with no session (parcel voice disabled), which keeps the conversation voice indicator green
     // Only report proximal when a spatial session is established
     static LLCachedControl<bool> require_established_session(gSavedSettings, "DebugWebRTCRequireEstablishedSpatialSession", false);
diff --git a/indra/newview/skins/default/xui/az/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/az/floater_fs_group_titles.xml
index d3bbc05c5f..9a1ee80561 100644
--- a/indra/newview/skins/default/xui/az/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/az/floater_fs_group_titles.xml
@@ -14,5 +14,4 @@
 	<button name="btnClearRegion" label="Bölgəni sil" tool_tip="Seçilmiş başlıqdan bölgə təyinatını silin" />
 	<button name="btnInfo" label="Məlumat" tool_tip="Seçilmiş qrup başlıqı ilə bağlı qrup haqqında məlumat göstərin" />
 	<button name="btnActivate" label="Aktivləşdir" tool_tip="Seçilmiş qrup başlıqını aktivləşdirin" />
-	<check_box label="Təyinatsız bölgələrdə 'yoxdur' et" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/de/floater_fs_group_titles.xml
index c028c628a1..c5f3e7cedf 100644
--- a/indra/newview/skins/default/xui/de/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/de/floater_fs_group_titles.xml
@@ -4,6 +4,7 @@
 	<floater.string name="ClearAllRegions" value="Alle Regionen löschen"/>
 	<filter_editor label="Nach Gruppentiteln filtern" name="filter_input"/>
 	<scroll_list name="title_list">
+		<column name="default_marker" label="S" tool_tip="Standard-Titel in Regionen ohne Zuweisung"/>
 		<column name="grouptitle" label="Titel"/>
 		<column name="groupname" label="Gruppe"/>
 		<column name="regionname" label="Auto-Region"/>
@@ -14,5 +15,6 @@
 	<button name="btnClearRegion" label="Region löschen" tool_tip="Regionszuweisung des ausgewählten Titels entfernen"/>
 	<button name="btnInfo" label="Info" tool_tip="Informationen zur Gruppe des aktuell ausgewählten Titels anzeigen"/>
 	<button name="btnActivate" label="Aktivieren" tool_tip="Aktuell ausgewählten Gruppentitel aktivieren"/>
-	<check_box label="'Keiner' in Regionen ohne Zuweisung" name="none_on_unassigned" />
+	<check_box name="use_default_title" label="Standard-Titel in Regionen ohne Zuweisung verwenden" tool_tip="Wenn eine Region ohne Titel-Zuweisung betreten wird, wird automatisch der markierte Titel aktiviert. Ein Standard von &lt;Kein Titel&gt; aktiviert keinen Titel."/>
+	<button name="btnSetDefault" label="Als Standard setzen" tool_tip="Setzt den markierten Titel als Standard-Titel für Regionen ohne Zuweisung"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/en/floater_fs_group_titles.xml
index 06db1f907c..b4cccdd316 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_group_titles.xml
@@ -36,6 +36,11 @@
 	 right="-5"
 	 left="5"
 	 height="255">
+		<column
+		 name="default_marker"
+		 label="D"
+		 tool_tip="Default title worn in regions without an assignment"
+		 width="24" />
 		<column
 		 name="grouptitle"
 		 sort_column="title_sort_column"
@@ -60,6 +65,9 @@
 		<column
 		 name="name_sort_column"
 		 width="-1"/>
+		<column
+		 name="filter_text"
+		 width="-1"/>
 	</scroll_list>
 
 	<button
@@ -125,8 +133,21 @@
 	<check_box
 	 follows="left|bottom"
 	 height="16"
-	 label="Set to 'none' in unassigned regions"
 	 layout="topleft"
 	 left="5"
-	 name="none_on_unassigned" />
+	 top_pad="6"
+	 name="use_default_title"
+	 label="Use default title in regions without assignment"
+	 tool_tip="When you enter a region with no title assignment, switch to the title marked as default. A default of &lt;No group title&gt; wears no tag."
+	 width="350" />
+	<button
+	 name="btnSetDefault"
+	 label="Set as default"
+	 font="SansSerifSmall"
+	 tool_tip="Mark the selected title as the default for regions without an assignment"
+	 height="22"
+	 width="130"
+	 right="-4"
+	 top_delta="-3"
+	 follows="right|bottom"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/es/floater_fs_group_titles.xml
index cbff7bd112..1ca79832a9 100644
--- a/indra/newview/skins/default/xui/es/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/es/floater_fs_group_titles.xml
@@ -13,5 +13,4 @@
 	<button name="btnClearRegion" label="Borrar región" tool_tip="Eliminar la asignación de región del título seleccionado"/>
 	<button name="btnInfo" label="Información" tool_tip="Muestra información sobre el grupo del título seleccionado"/>
 	<button name="btnActivate" label="Activar" tool_tip="Activa el título de grupo seleccionado"/>
-	<check_box label="'Ninguno' en regiones sin preajuste" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/fr/floater_fs_group_titles.xml
index e9c028c8e3..2d58e97d70 100644
--- a/indra/newview/skins/default/xui/fr/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fs_group_titles.xml
@@ -13,5 +13,4 @@
 	<button name="btnClearRegion" label="Effacer région" tool_tip="Supprimer l'assignation de région du titre sélectionné"/>
 	<button name="btnInfo" label="Infos" tool_tip="Afficher les informations sur le groupe du titre sélectionné"/>
 	<button name="btnActivate" label="Activer" tool_tip="Activer le titre du groupe sélectionné"/>
-	<check_box label="'Aucun' pour régions sans préréglage" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/it/floater_fs_group_titles.xml
index 24a723b202..2e2ad9d2fe 100644
--- a/indra/newview/skins/default/xui/it/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/it/floater_fs_group_titles.xml
@@ -14,5 +14,4 @@
 	<button name="btnClearRegion" label="Cancella reg." tool_tip="Rimuovi l'assegnazione della regione dal titolo selezionato" />
 	<button name="btnInfo" tool_tip="Mostra il profilo del gruppo del titolo selezionato" />
 	<button name="btnActivate" label="Attiva" tool_tip="Attiva il titolo selezionato" />
-	<check_box label="'Nessuno' nelle regioni senza preset" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/ja/floater_fs_group_titles.xml
index eaf01f40e4..4a11ca4bea 100644
--- a/indra/newview/skins/default/xui/ja/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fs_group_titles.xml
@@ -14,5 +14,4 @@
 	<button name="btnClearRegion" label="地域を消去" tool_tip="選択したタイトルから地域の割り当てを削除します"/>
 	<button name="btnInfo" label="情報" tool_tip="選択したタイトルのグループに関する情報を表示します。" />
 	<button name="btnActivate" label="アクティブ" tool_tip="選択したグループのタイトルをアクティブにします。"/>
-	<check_box label="未設定の地域では「なし」にする" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/pl/floater_fs_group_titles.xml
index 67e2663f09..52bf6de09a 100644
--- a/indra/newview/skins/default/xui/pl/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/pl/floater_fs_group_titles.xml
@@ -4,6 +4,7 @@
 	<floater.string name="ClearAllRegions" value="Wyczyść wszystkie regiony"/>
 	<filter_editor label="Filtruj tytuły grup" name="filter_input" />
 	<scroll_list name="title_list">
+		<column name="default_marker" tool_tip="Domyślny tytuł włączony w regionach bez przypisania" />
 		<column name="grouptitle" label="Tytuł" />
 		<column name="groupname" label="Grupa" />
 		<column name="regionname" label="Auto-region" />
@@ -14,5 +15,6 @@
 	<button name="btnClearRegion" label="Wyczyść region" tool_tip="Usuń przypisanie regionu z wybranego tytułu" />
 	<button name="btnInfo" label="Info" tool_tip="Pokaż informacje o grupie związanej z wybranym tytułem" />
 	<button name="btnActivate" label="Aktywuj" tool_tip="Aktywuj wybrany tytuł grupy" />
-	<check_box label="Ustaw 'brak' w regionach bez przypisania" name="none_on_unassigned" />
+	<check_box name="use_default_title" label="Użyj domyślnego tytułu w regionach bez przypisania" tool_tip="Gdy pojawisz się w regionie do którego nie przypisano tytułu, to przełącz się na tytuł oznaczony jako domyślny. Domyślne &lt;Brak tytułu grupy&gt; nie dodaje żadnego taga grupy." />
+	<button name="btnSetDefault" label="Ustaw jako domyślny" tool_tip="Oznacz wybrany tytuł jako domyślny dla regionów bez przypisania" />
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/pt/floater_fs_group_titles.xml
index 8f1c306b82..2b1b978bbf 100644
--- a/indra/newview/skins/default/xui/pt/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/pt/floater_fs_group_titles.xml
@@ -14,5 +14,4 @@
 	<button name="btnClearRegion" label="Limpar região" tool_tip="Remover atribuição de região do título selecionado"/>
 	<button name="btnInfo" label="Info" tool_tip="Mostrar informações do grupo do título selecionado"/>
 	<button name="btnActivate" label="Ativar" tool_tip="Ativar o título de grupo selecionado"/>
-	<check_box label="'Nenhum' em regiões sem atribuição" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/ru/floater_fs_group_titles.xml
index 4436b400aa..1e7872cc5a 100644
--- a/indra/newview/skins/default/xui/ru/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fs_group_titles.xml
@@ -14,5 +14,4 @@
 	<button name="btnClearRegion" label="Очистить рег." tool_tip="Удалить привязку региона для выбранного титула" />
 	<button name="btnInfo" label="инфо" tool_tip="Показать информацию о группе, связанную с выбранным титулом" />
 	<button name="btnActivate" label="Активировать" tool_tip="Активировать выбранный титул группы" />
-	<check_box label="«Нет» в регионах без назначения" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_ao.xml b/indra/newview/skins/default/xui/zh/floater_ao.xml
index 72a5a9ff37..8b9a573696 100644
--- a/indra/newview/skins/default/xui/zh/floater_ao.xml
+++ b/indra/newview/skins/default/xui/zh/floater_ao.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="animation_overrider" title="動畫覆蓋器">
-	<floater.string name="ao_no_sets_loaded">
-		未載入設定
-	</floater.string>
-	<floater.string name="ao_no_animations_loaded">
-		未載入動畫
-	</floater.string>
-	<floater.string name="ao_dnd_only_on_full_interface">
-		帶有 AO 設定的記事卡&amp;只能拖放到最大化的視窗中。點擊工具圖示可最大化視窗。
-	</floater.string>
+	<floater.string name="ao_no_sets_loaded">未載入設定</floater.string>
+	<floater.string name="ao_no_animations_loaded">未載入動畫</floater.string>
+	<floater.string name="ao_dnd_only_on_full_interface">帶有 AO 設定的記事卡&amp;只能拖放到最大化的視窗中。點擊工具圖示可最大化視窗。</floater.string>
+	<floater.string name="ao_add_blank_label">新建空白動畫集...</floater.string>
+	<floater.string name="ao_add_clone_label">複製目前動畫集...</floater.string>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml b/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml
index 61b6841dec..77461670af 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_area_search.xml
@@ -48,6 +48,7 @@
 			<check_box name="regular_expression" label="使用正規表示式" />
 			<button name="search" label="搜尋" />
 			<button name="clear" label="移除" />
+			<button name="copy_link" label="複製為連結" tool_tip="複製 secondlife:///app/openfloater/area_search?... 連結，用於重現目前的搜尋條件與篩選設定。"/>
 		</panel>
 		<panel label="過濾" name="area_search_filter_panel">
 			<text name="only_list">
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml b/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml
index 5c4ae17ab3..4662047693 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_contact_set_configuration.xml
@@ -17,7 +17,10 @@
 		<text name="global_label">
 			全域設定：
 		</text>
+		<check_box label="在聯絡人分組列表中顯示個人檔案圖示" name="FSContactSetsListShowIcons" />
 		<color_swatch label="顏色" name="global_swatch" tool_tip="點擊以打開顏色選擇" />
+		<color_swatch name="offline_swatch" tool_tip="用於未歸入任何分組的聯絡人離線狀態顏色。在聯絡人自訂分組中，自訂的分組顏色具有更高優先權。" />
+		<check_box label="自訂離線聯絡人顏色" name="FSContactSetsListColorizeOffline" />
 		<text name="label_online">
 			在線通知：
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_fs_group_titles.xml b/indra/newview/skins/default/xui/zh/floater_fs_group_titles.xml
index 42302ba902..93941e39e0 100644
--- a/indra/newview/skins/default/xui/zh/floater_fs_group_titles.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fs_group_titles.xml
@@ -14,5 +14,4 @@
 	<button name="btnClearRegion" label="清除區域" tool_tip="移除所選頭銜的區域指派"/>
 	<button name="btnInfo" label="資訊" tool_tip="顯示目前所選頭銜所屬群組的資訊"/>
 	<button name="btnActivate" label="啟用" tool_tip="啟用目前選取的群組頭銜"/>
-	<check_box label="在未指派區域中顯示「無」" name="none_on_unassigned" />
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index ad3c8bc9b0..53f715679c 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -17,10 +17,7 @@
 	</text_editor>
 	<button tool_tip="尋找和替換" name="Search" />
 	<button label="編輯…" label_selected="編輯" name="Edit" />
-	<text
-		name="byte_counter"
-		initial_value="字节: [BYTES] / [MAX]"
-	/>
+	<text name="byte_counter" initial_value="位元組: [BYTES] / [MAX]" />
 	<button label="儲存" label_selected="儲存" name="Save" />
 	<button label="刪除" label_selected="刪除" name="Delete" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
index e614fbfb28..cb312b9b2c 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -16,6 +16,7 @@
 			<text name="htmllink_label">網址</text>
 			<text name="uriquerypart_label">網址路徑</text>
 			<text name="direct_label">管理</text>
+			<text name="server_chat_history_label">來自伺服器的群組聊天記錄</text>
 			<text name="header_colors">發件人：</text>
 			<text name="chat_name_label">化身</text>
 			<text name="object_name_header_label">物件</text>