Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

2021-09-20 11:56:37 +02:00 · 2021-09-20 11:56:37 +02:00 · 71e989aaa3
parent 9cc2da506f aa27720583
commit 71e989aaa3
76 changed files with 229 additions and 155 deletions
--- a/autobuild.xml
+++ b/autobuild.xml
@ -850,9 +850,9 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>2b29e6435ea9487bc2019a28b8287d6a</string>
+              <string>7b8fd7a8ea9850f1cad187059d2da4af</string>
              <key>url</key>
-              <string>http://3p.firestormviewer.org/dullahan-1.8.0.202011061705_81.3.10_gb223419_chromium-81.0.4044.138-linux64-203111605.tar.bz2</string>
+              <string>http://3p.firestormviewer.org/dullahan-1.12.2.202109131147_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212560947.tar.bz2</string>
            </map>
            <key>name</key>
            <string>linux64</string>
@ -1932,9 +1932,9 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>3b8b0f54c851f136e2a92e1c6ba724a5</string>
+              <string>e99b86fc3ed48a778580dd1449f8f33b</string>
              <key>url</key>
-              <string>file:///opt/firestorm/kdu-8.1-darwin64-211970151.tar.bz2</string>
+              <string>file:///opt/firestorm/kdu-8.2-darwin-212431232.tar.bz2</string>
            </map>
            <key>name</key>
            <string>darwin64</string>
@ -1944,9 +1944,9 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>dce2cc624e216eb991412ec0c5538cf9</string>
+              <string>94f8c766d77d68e0b8b1ac783b6a02dc</string>
              <key>url</key>
-              <string>file:///opt/firestorm/kdu-8.1-linux64-210652339.tar.bz2</string>
+              <string>file:///opt/firestorm/kdu-8.2-linux64-212351600.tar.bz2</string>
            </map>
            <key>name</key>
            <string>linux64</string>
@ -1956,9 +1956,9 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>1cd284c85b5f05fff6b286e85b55ebf2</string>
+              <string>e88372fa10b83c6900443dcc12c12338</string>
              <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/kdu-8.1-windows-210862059.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/kdu-8.2-windows-212351246.tar.bz2</string>
            </map>
            <key>name</key>
            <string>windows</string>
@ -1968,9 +1968,9 @@
            <key>archive</key>
            <map>
              <key>hash</key>
-              <string>1cd284c85b5f05fff6b286e85b55ebf2</string>
+              <string>e88372fa10b83c6900443dcc12c12338</string>
              <key>url</key>
-              <string>file:///c:/cygwin/opt/firestorm/kdu-8.1-windows-210862059.tar.bz2</string>
+              <string>file:///c:/cygwin/opt/firestorm/kdu-8.2-windows-212351246.tar.bz2</string>
            </map>
            <key>name</key>
            <string>windows64</string>
--- a/indra/llfilesystem/lldiskcache.cpp
+++ b/indra/llfilesystem/lldiskcache.cpp
@ -71,7 +71,7 @@ LLDiskCache::LLDiskCache(const std::string cache_dir,

 void LLDiskCache::purge()
 {
-    //if (mEnableCacheDebugInfo)
+    if (mEnableCacheDebugInfo)
    {
        LL_INFOS() << "Total dir size before purge is " << dirFileSize(mCacheDir) << LL_ENDL;
    }
@ -93,7 +93,7 @@ void LLDiskCache::purge()
        //for (auto& entry : boost::make_iterator_range(boost::filesystem::directory_iterator(cache_path, ec), {}))
        for (auto& entry : boost::make_iterator_range(boost::filesystem::recursive_directory_iterator(cache_path, ec), {}))
        {
-            if (boost::filesystem::is_regular_file(entry, ec) && !ec.failed())
+            if (!ec.failed() && (boost::filesystem::is_regular_file(entry, ec) && !ec.failed()))
            {
                if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos)
                {
@ -181,7 +181,7 @@ void LLDiskCache::purge()
        }
    }

-    //if (mEnableCacheDebugInfo)
+    if (mEnableCacheDebugInfo)
    {
        auto end_time = std::chrono::high_resolution_clock::now();
        auto execute_time = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time).count();
@ -485,7 +485,7 @@ uintmax_t LLDiskCache::dirFileSize(const std::string dir)
        //for (auto& entry : boost::make_iterator_range(boost::filesystem::directory_iterator(dir_path, ec), {}))
        for (auto& entry : boost::make_iterator_range(boost::filesystem::recursive_directory_iterator(dir_path, ec), {}))
        {
-            if (boost::filesystem::is_regular_file(entry, ec) && !ec.failed())
+            if (!ec.failed() && (boost::filesystem::is_regular_file(entry, ec) && !ec.failed()))
            {
                if (entry.path().string().find(mCacheFilenamePrefix) != std::string::npos)
                {
--- a/indra/llkdu/llimagej2ckdu.cpp
+++ b/indra/llkdu/llimagej2ckdu.cpp
@ -321,7 +321,12 @@ void LLImageJ2CKDU::setupCodeStream(LLImageJ2C &base, bool keep_codestream, ECod
 	// *TODO: This seems to be wrong. The base class should have no idea of
 	// how j2c compression works so no good way of computing what's the byte
 	// range to be used.
+#if (KDU_MAJOR_VERSION*10000 + KDU_MINOR_VERSION*100 + KDU_PATCH_VERSION) >= 80200
+	mCodeStreamp->set_max_bytes(max_bytes, false);
+#else
 	mCodeStreamp->set_max_bytes(max_bytes,true);
+#endif
+

 	//	If you want to flip or rotate the image for some reason, change
 	// the resolution, or identify a restricted region of interest, this is
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@ -1905,7 +1905,9 @@ BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, MASK mask)
 		LLScrollListCell* hit_cell = hit_item->getColumn(column_index);
 		if (!hit_cell) return FALSE;
 		if (hit_cell 
-			&& hit_cell->isText()
+			// <FS:Zi> Why would we restrict tool tips to text fields only?
+			//         Having them on non-text fields seems really useful
+			// && hit_cell->isText()
 			&& hit_cell->needsToolTip())
 		{
 			S32 row_index = getItemIndex(hit_item);
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@ -141,6 +141,10 @@ MediaPluginBase(host_send_func, host_user_data)
 	mPickedFiles.clear();
 	mCurVolume = 0.0;

+#ifdef LL_LINUX
+	mDisableGPU = true;
+#endif
+	
 	mCEFLib = new dullahan();

 	setVolume();
@ -1010,12 +1014,7 @@ void MediaPluginCEF::checkEditState()

 void MediaPluginCEF::setVolume()
 {
-	//mVolumeCatcher.setVolume(mCurVolume);
-#if 0//(DULLAHAN_VERSION_MAJOR*100 + DULLAHAN_VERSION_MINOR) >= 108
-	mCEFLib->setVolume(mCurVolume);
-#else
 	mVolumeCatcher.setVolume(mCurVolume);
-#endif
 }

 ////////////////////////////////////////////////////////////////////////////////
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@ -612,7 +612,7 @@ set(viewer_SOURCE_FILES
    llpanelteleporthistory.cpp
    llpaneltiptoast.cpp
    llpanelvoiceeffect.cpp
-    llpaneltopinfobar.cpp
+    #llpaneltopinfobar.cpp # <FS:Zi> unused
    llpanelpulldown.cpp
    llpanelvoicedevicesettings.cpp
    llpanelvolume.cpp
@ -1378,7 +1378,7 @@ set(viewer_HEADER_FILES
    llpanelpulldown.h
    llpanelvoicedevicesettings.h
    llpanelvoiceeffect.h
-    llpaneltopinfobar.h
+    #llpaneltopinfobar.h # <FS:Zi> unused
    llpanelvolume.h
    llpanelvolumepulldown.h
    llpanelwearing.h
--- a/indra/newview/app_settings/grids.xml
+++ b/indra/newview/app_settings/grids.xml
@ -953,7 +953,7 @@
                <string>agent</string>
            </array>
        <key>loginpage</key>
-            <string>http://phoenixviewer.com/app/loginV3/</string>
+            <string>https://phoenixviewer.com/app/loginV3/</string>
        <key>loginuri</key>
            <array>
                <string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
@ -986,7 +986,7 @@
            <string>agent</string>
        </array>
        <key>loginpage</key>
-        <string>http://phoenixviewer.com/app/loginV3/</string>
+        <string>https://phoenixviewer.com/app/loginV3/</string>
        <key>loginuri</key>
        <array>
            <string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@ -24245,7 +24245,7 @@ Change of this parameter will affect the layout of buttons in notification toast
      <key>Type</key>
      <string>String</string>
      <key>Value</key>
-      <string>http://phoenixviewer.com/app/loginV3/secondlifegrid.xml</string>
+      <string>https://phoenixviewer.com/app/loginV3/secondlifegrid.xml</string>
    </map>
    <key>FSIgnoreAdHocSessions</key>
    <map>
--- a/indra/newview/fsgridhandler.cpp
+++ b/indra/newview/fsgridhandler.cpp
@ -149,7 +149,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry*
 	}
 }

-const char* DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/";
+const char* DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/";

 const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
 const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";
--- a/indra/newview/fspanelradar.cpp
+++ b/indra/newview/fspanelradar.cpp
@ -389,7 +389,8 @@ void FSPanelRadar::updateList(const std::vector<LLSD>& entries, const LLSD& stat

 		row_data["columns"][6]["column"] = "has_notes";
 		row_data["columns"][6]["type"] = "icon";
-		row_data["columns"][6]["value"] = (entry["has_notes"].asBoolean() ? notesColumnIcon : "");
+		row_data["columns"][6]["value"] = (entry["notes"].asBoolean() ? notesColumnIcon : "");
+		row_data["columns"][6]["tool_tip"] = entry["notes"].asString();

 		row_data["columns"][7]["column"] = "age";
 		row_data["columns"][7]["value"] = entry["age"];
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@ -528,7 +528,7 @@ void FSRadar::updateRadarList()

 		if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
 		{
-			entry["has_notes"] = ent->hasNotes();
+			entry["notes"] = ent->getNotes();
 			entry["age"] = (avAge > -1 ? llformat("%d", avAge) : "");
 			if (ent->hasAlertAge())
 			{
@ -547,7 +547,7 @@ void FSRadar::updateRadarList()
 		}
 		else
 		{
-			entry["has_notes"] = false;
+			entry["notes"] = LLStringUtil::null;
 			entry["age"] = "---";
 		}

--- a/indra/newview/fsradarentry.cpp
+++ b/indra/newview/fsradarentry.cpp
@ -48,7 +48,7 @@ FSRadarEntry::FSRadarEntry(const LLUUID& avid)
 	mAge(-1),
 	mIsLinden(false),
 	mIgnore(false),
-	mHasNotes(false),
+	mNotes(LLStringUtil::null),
 	mAlertAge(false),
 	mAgeAlertPerformed(false),
 	mAvatarNameCallbackConnection()
@ -124,9 +124,10 @@ void FSRadarEntry::processProperties(void* data, EAvatarProcessorType type)
 		else if (type == APT_NOTES)
 		{
 			LLAvatarNotes* avatar_notes = static_cast<LLAvatarNotes*>(data);
-			if (avatar_notes && avatar_notes->agent_id == gAgentID && avatar_notes->target_id == mID)
+			if (avatar_notes && avatar_notes->agent_id == gAgentID && avatar_notes->target_id == mID && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
 			{
-				mHasNotes = !avatar_notes->notes.empty();
+				mNotes = avatar_notes->notes;
+				LLStringUtil::trim(mNotes);
 			}
 		}
 	}
--- a/indra/newview/fsradarentry.h
+++ b/indra/newview/fsradarentry.h
@ -41,9 +41,10 @@ public:
 	~FSRadarEntry();

 	LLUUID		getId() const { return mID; }
-	std::string	getName() const { return mName; }
-	std::string	getUserName() const { return mUserName; }
-	std::string	getDisplayName() const { return mDisplayName; }
+	const std::string& getName() const { return mName; }
+	const std::string& getUserName() const { return mUserName; }
+	const std::string& getDisplayName() const { return mDisplayName; }
+	const std::string& getNotes() const { return mNotes; }
 	F32			getRange() const { return mRange; }
 	LLVector3d	getGlobalPos() const { return mGlobalPos; }
 	LLUUID		getRegion() const { return mRegion; }
@ -54,7 +55,6 @@ public:
 	time_t		getLastZOffsetTime() const { return mLastZOffsetTime; }
 	bool		getIsLinden() const { return mIsLinden; }
 	bool		getIgnore() const { return mIgnore; }
-	bool		hasNotes() const { return mHasNotes; }
 	bool		hasAlertAge() const { return mAlertAge; }
 	bool		hasAgeAlertPerformed() const { return mAgeAlertPerformed; }

@ -72,6 +72,7 @@ private:
 	std::string mName;
 	std::string mUserName;
 	std::string mDisplayName;
+	std::string mNotes;
 	F32			mRange;
 	LLVector3d	mGlobalPos;
 	LLUUID		mRegion;
@ -82,7 +83,6 @@ private:
 	time_t		mLastZOffsetTime;
 	bool		mIsLinden;
 	bool		mIgnore;
-	bool		mHasNotes;
 	bool		mAlertAge;
 	bool		mAgeAlertPerformed;

--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@ -66,7 +66,8 @@
 // </FS:Ansariel> [FS Communication UI]
 #include "llspeakers.h"
 #include "llnotificationsutil.h"
-#include "llpaneltopinfobar.h"
+// <FS:Zi> We don't use the mini location panel in Firestorm
+// #include "llpaneltopinfobar.h"
 #include "llparcel.h"
 #include "llrendersphere.h"
 #include "llscriptruntimeperms.h"
@ -2618,10 +2619,12 @@ void LLAgent::endAnimationUpdateUI()
 		LLNavigationBar::instance().getView()->setVisible(TRUE);
 		gStatusBar->setVisibleForMouselook(true);

-		if (gSavedSettings.getBOOL("ShowMiniLocationPanel"))
-		{
-			LLPanelTopInfoBar::getInstance()->setVisible(TRUE);
-		}
+		// <FS:Zi> We don't use the mini location panel in Firestorm
+		// if (gSavedSettings.getBOOL("ShowMiniLocationPanel"))
+		// {
+		// 	LLPanelTopInfoBar::getInstance()->setVisible(TRUE);
+		// }
+		// </FS:Zi>

 		LLChicletBar::getInstance()->setVisible(TRUE);

@ -2780,7 +2783,8 @@ void LLAgent::endAnimationUpdateUI()
 		LLNavigationBar::instance().getView()->setVisible(FALSE);
 		gStatusBar->setVisibleForMouselook(false);

-		LLPanelTopInfoBar::getInstance()->setVisible(FALSE);
+		// <FS:Zi> We don't use the mini location panel in Firestorm
+		// LLPanelTopInfoBar::getInstance()->setVisible(FALSE);

 		LLChicletBar::getInstance()->setVisible(FALSE);

--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@ -4266,7 +4266,11 @@ void LLAppViewer::writeSystemInfo()
 	gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall");
    gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();

-	std::vector<std::string> resolutions = gViewerWindow->getWindow()->getDisplaysResolutionList();
+	// <FS:ND> FIRE-31153, do not use gViewerWindow->getWindow which equals nullptr at this point
+	//std::vector<std::string> resolutions = gViewerWindow->getWindow()->getDisplaysResolutionList();
+	std::vector<std::string> resolutions = LLWindow::getDisplaysResolutionList();
+	// </FS:ND>
+
 	for (auto res_iter : resolutions)
 	{
 		gDebugInfo["DisplayInfo"].append(res_iter);
@ -4959,7 +4963,7 @@ bool LLAppViewer::initCache()
    // </FS:Ansariel>
    // <FS:Ansariel> Fix integer overflow
    //const unsigned int disk_cache_bytes = disk_cache_mb * 1024 * 1024;
-    const uintmax_t disk_cache_bytes = disk_cache_mb * 1024 * 1024;
+    const uintmax_t disk_cache_bytes = disk_cache_mb * 1024ULL * 1024ULL;
 	const bool enable_cache_debug_info = gSavedSettings.getBOOL("EnableDiskCacheDebugInfo");

 	bool texture_cache_mismatch = false;
--- a/indra/newview/llchicletbar.cpp
+++ b/indra/newview/llchicletbar.cpp
@ -29,7 +29,8 @@

 #include "llchiclet.h"
 #include "lllayoutstack.h"
-#include "llpaneltopinfobar.h"
+// <FS:Zi> We don't use the mini location panel in Firestorm
+// #include "llpaneltopinfobar.h"
 #include "llsyswellwindow.h"
 #include "llfloaternotificationstabbed.h"

@ -325,6 +326,8 @@ S32 LLChicletBar::getChicletPanelShrinkHeadroom() const

 void LLChicletBar::fitWithTopInfoBar()
 {
+	// <FS:Zi> We don't use the mini location panel in Firestorm
+	#if 0
 	LLPanelTopInfoBar& top_info_bar = LLPanelTopInfoBar::instance();

 	LLRect rect = getRect();
@ -351,6 +354,8 @@ void LLChicletBar::fitWithTopInfoBar()

 	setRect(rect);
 	LLPanel::reshape(width, rect.getHeight(), false);
+	#endif
+	// </FS:Zi>
 }

 // <FS:Ansariel> Option to hide IM/Group chat chiclets
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@ -581,8 +581,12 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
 	}
 	LLVOAvatar::AvatarOverallAppearance oa = avatarp->getOverallAppearance();
 	BOOL impostor = !LLPipeline::sImpostorRender && avatarp->isImpostor();
-	if (oa == LLVOAvatar::AOA_INVISIBLE ||
-		(impostor && oa == LLVOAvatar::AOA_JELLYDOLL))
+	// <FS:Beq> plain old impostors are passing through the shadow pipeline
+	// if (oa == LLVOAvatar::AOA_INVISIBLE ||
+	// 	(impostor && oa == LLVOAvatar::AOA_JELLYDOLL))
+	// Note: Impostors should not cast shadows, also all JDs are impostor nowadays so we do not need the extra check at all.
+	if (impostor || (oa == LLVOAvatar::AOA_INVISIBLE) )
+	// </FS:Beq>
 	{
 		// No shadows for jellydolled or invisible avs.
 		return;
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@ -5739,6 +5739,25 @@ BOOL FSPanelPreferenceBackup::postBuild()
 	getChild<LLLineEditor>("settings_backup_path")->setValue(dir_name);
 	// </FS:Zi>
 	
+	// <FS:Beq>
+	#if !defined OPENSIM
+	// Note: Windlight setting restore is enabled in OPENSIM bulds irrespective of grid (or pre-login)
+	// windlights settings folders are not grid specific and thus neither is the restore.
+	// if windlight folders existsed they will be backed up on all builds but for SL only builds they will not be restored.
+
+	LLScrollListCtrl* globalFoldersScrollList = getChild<LLScrollListCtrl>("restore_global_folders_list");
+	std::vector<LLScrollListItem*> globalFoldersList = globalFoldersScrollList->getAllData();
+	for (const auto item : globalFoldersList)
+	{
+		// if it is windlight related remove it.
+		if (item->getValue().asString().rfind("windlight",0) == 0)
+		{
+			LL_INFOS() << "removing windlight folder (no longer used in SL) : " << item->getValue().asString() << " index: " << globalFoldersScrollList->getItemIndex(item) << LL_ENDL;
+			globalFoldersScrollList->deleteSingleItem(globalFoldersScrollList->getItemIndex(item));
+		}
+	}
+	#endif
+	// </FS:Beq>
 	return LLPanelPreference::postBuild();
 }

--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@ -42,7 +42,8 @@
 #include "lllandmarkactions.h"
 #include "lllocationhistory.h"
 #include "lllocationinputctrl.h"
-#include "llpaneltopinfobar.h"
+// <FS:Zi> We don't use the mini location panel in Firestorm
+// #include "llpaneltopinfobar.h"
 #include "llteleporthistory.h"
 #include "llresizebar.h"
 #include "llsearchcombobox.h"
@ -842,7 +843,8 @@ void LLNavigationBar::onNavigationButtonHeldUp(LLButton* nav_button)
 void LLNavigationBar::handleLoginComplete()
 {
 	LLTeleportHistory::getInstance()->handleLoginComplete();
-	LLPanelTopInfoBar::instance().handleLoginComplete();
+	// <FS:Zi> We don't use the mini location panel in Firestorm
+	// LLPanelTopInfoBar::instance().handleLoginComplete();
 	gStatusBar->handleLoginComplete();
 	mCmbLocation->handleLoginComplete();
 	// <FS:Ansariel> Commented out because we don't have the LL viewer layout
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@ -970,7 +970,9 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion)
 		// <FS:Ansariel> Reset VB during TP
 		if (is_tree_group && drawable->getVObj())
 		{
-			((LLVOTree*)drawable->getVObj().get())->destroyVB();
+			auto votree = dynamic_cast<LLVOTree*>(drawable->getVObj().get());
+			if (votree)
+				votree->destroyVB();
 		}
 		// </FS:Ansariel>
 	}
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@ -704,7 +704,14 @@ bool LLToolPie::walkToClickedLocation()
        }
 // [/RLVa:KB]

-        gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+        // <FS:PP> FIRE-31135 Do not reset camera position for "click to walk"
+        // gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+        static LLCachedControl<bool> sResetCameraOnMovement(gSavedSettings, "FSResetCameraOnMovement");
+        if (sResetCameraOnMovement)
+        {
+            gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
+        }
+        // </FS:PP>

        if (mAutoPilotDestination) { mAutoPilotDestination->markDead(); }
        mAutoPilotDestination = (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE);
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@ -74,7 +74,8 @@
 //#include "llpanellogin.h"
 #include "fspanellogin.h"
 // </FS:Ansariel> [FS Login Panel]
-#include "llpaneltopinfobar.h"
+// <FS:Zi> We don't use the mini location panel in Firestorm
+// #include "llpaneltopinfobar.h"
 #include "llspellcheck.h"
 #include "llslurl.h"
 #include "llstartup.h"
@ -1053,7 +1054,7 @@ void handlePlayBentoIdleAnimationChanged(const LLSD& newValue)
 void handleDiskCacheSizeChanged(const LLSD& newValue)
 {
 	const unsigned int disk_cache_mb = gSavedSettings.getU32("FSDiskCacheSize");
-	const U64 disk_cache_bytes = disk_cache_mb * 1024 * 1024;
+	const U64 disk_cache_bytes = disk_cache_mb * 1024ULL * 1024ULL;
 	LLDiskCache::getInstance()->setMaxSizeBytes(disk_cache_bytes);
 }
 // </FS:Ansariel>
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@ -62,7 +62,7 @@ const std::string  GRID_LOGIN_IDENTIFIER_TYPES = "login_identifier_types";
 const std::string GRID_SLURL_BASE = "slurl_base";
 const std::string GRID_APP_SLURL_BASE = "app_slurl_base";

-const std::string DEFAULT_LOGIN_PAGE = "http://phoenixviewer.com/app/loginV3/";
+const std::string DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/";

 const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";

--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@ -142,7 +142,8 @@
 #include "llmoveview.h"
 #include "llnavigationbar.h"
 #include "llnotificationhandler.h"
-#include "llpaneltopinfobar.h"
+// <FS:Zi> We don't use the mini location panel in Firestorm
+// #include "llpaneltopinfobar.h"
 #include "llpopupview.h"
 #include "llpreviewtexture.h"
 #include "llprogressview.h"
@ -7098,7 +7099,8 @@ void LLViewerWindow::setUIVisibility(bool visible)

 	// <FS:Zi> Is done inside XUI now, using visibility_control
 	//LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
-	LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE);
+	// <FS:Zi> We don't use the mini location panel in Firestorm
+	// LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE);
 	mRootView->getChildView("status_bar_container")->setVisible(visible);

 	// <FS:Zi> hide utility bar if we are on a skin that uses it, e.g. Vintage
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@ -23,7 +23,8 @@
 #include "llmoveview.h"					// Movement panel (contains "Stand" and "Stop Flying" buttons)
 #include "llnavigationbar.h"			// Navigation bar
 #include "llparcel.h"
-#include "llpaneltopinfobar.h"
+// <FS:Zi> We don't use the mini location panel in Firestorm
+// #include "llpaneltopinfobar.h"
 #include "llteleporthistory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
@ -114,8 +115,10 @@ void RlvUIEnabler::onToggleShowLoc()

 	if (LLNavigationBar::instanceExists())
 		LLNavigationBar::instance().refreshLocationCtrl();
-	if (LLPanelTopInfoBar::instanceExists())
-		LLPanelTopInfoBar::instance().update();
+	// <FS:Zi> We don't use the mini location panel in Firestorm
+	// if (LLPanelTopInfoBar::instanceExists())
+	// 	LLPanelTopInfoBar::instance().update();
+	// </FS:Zi> We don't use the mini location panel in Firestorm

 	if (!fEnable)
 	{
--- a/indra/newview/skins/default/xui/da/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/da/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Teleportér" name="Teleport To Landmark"/>
+	<menu_item_call label="Vis på kort" name="Show On Map"/>
 	<menu_item_call label="Vis/ret landemærke" name="Landmark Open"/>
 	<menu_item_call label="Kopiér SLurl" name="Copy slurl"/>
-	<menu_item_call label="Vis på kort" name="Show On Map"/>
 	<menu_item_call label="Kopiér" name="Landmark Copy"/>
 	<menu_item_call label="Sæt ind" name="Landmark Paste"/>
 	<menu_item_call label="Slet" name="Delete"/>
--- a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleportér" name="teleport"/>
-	<menu_item_call label="Mere information" name="more_info"/>
 	<menu_item_call label="Vis på kort" name="show_on_map"/>
+	<menu_item_call label="Mere information" name="more_info"/>
 	<menu_item_call label="Tilføj landemærke" name="add_landmark"/>
 	<menu_item_call label="Tilføj mappe" name="add_folder"/>
 	<menu_item_call label="Gendan genstand" name="restore_item"/>
--- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@ -7,7 +7,6 @@
 			</text>
 			<check_box label="Speciel port" name="connection_port_enabled"/>
 			<spinner label="Port nummer:" name="connection_port"/>
-			<check_box label="Aktivér plugins" name="browser_plugins_enabled"/>
 			<check_box label="Acceptér cookies" name="cookies_enabled"/>
 			<check_box label="Aktivér Javascript" name="browser_javascript_enabled"/>
 			<check_box label="Tilad media browser pop-ups" name="media_popup_enabled"/>
--- a/indra/newview/skins/default/xui/de/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/de/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Teleportieren" name="Teleport To Landmark"/>
+	<menu_item_call label="Auf Karte zeigen" name="Show On Map"/>
 	<menu_item_call label="Landmarken anzeigen/bearbeiten" name="Landmark Open"/>
 	<menu_item_call label="Zu Landmarken verschieben" name="Move to Landmarks"/>
-	<menu_item_call label="Auf Karte zeigen" name="Show On Map"/>
 	<menu_item_call label="SLurl kopieren" name="Copy slurl"/>
 	<menu_item_call label="Auswahl erstellen" name="create_pick"/>
 	<menu_item_call label="Kopieren" name="Landmark Copy"/>
--- a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleportieren" name="teleport"/>
+	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Teilen" name="share"/>
 	<menu_item_call label="Landmarke anzeigen/bearbeiten" name="more_info"/>
 	<menu_item_call label="Zu Landmarken verschieben" name="Move to Landmarks"/>
 	<menu_item_call label="Zu Favoriten verschieben" name="Move to Favorites"/>
-	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="SLurl kopieren" name="copy_slurl"/>
 	<menu_item_call label="Auswahl erstellen" name="create_pick"/>
 	<menu_item_call label="Objekt wiederherstellen" name="restore_item"/>
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@ -37,7 +37,6 @@
 				<combo_box.item label="Zehn Fenster" name="web_10"/>
 			</combo_box>
 			<button label="Webbrowser-Cache löschen" name="ClearWebBrowserCache" width="160"/>
-			<check_box label="Plugins aktivieren" name="browser_plugins_enabled"/>
 			<check_box label="Javascript aktivieren" name="browser_javascript_enabled"/>
 			<check_box label="Medienbrowser-Popups aktivieren" name="media_popup_enabled"/>
 			<!-- <button label="Proxy-Einstellungen ändern" label_selected="Proxy-Einstellungen ändern" name="set_proxy"/> -->
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@ -165,7 +165,7 @@ Additional code generously contributed to Firestorm by:
                 top_pad="4"
                 width="450"
                 wrap="true">
-Albatroz Hird, Alexie Birman, Andromeda Rage, Angeldark Raymaker, Animats, Armin Weatherwax, Beq Janus, Casper Warden, Chalice Yao, Chaser Zaks, Chorazin Allen, Cron Stardust, Damian Zhaoying, Dan Threebeards, Dawa Gurbux, Denver Maksim, Drake Arconis, Felyza Wishbringer, f0rbidden, Fractured Crystal, Geenz Spad, Gibson Firehawk, Hitomi Tiponi, Inusaito Sayori, Jean Severine, Katharine Berry, Kittin Ninetails, Kool Koolhoven, Lance Corrimal, Lassie, Latif Khalifa, Laurent Bechir, Magne Metaverse LLC, Magus Freston, Manami Hokkigai, MartinRJ Fayray, McCabe Maxstead, Melancholy Lemon, Melysmile, Mimika Oh, Mister Acacia, MorganMegan, mygoditsfullofstars, Mysty Saunders, Nagi Michinaga, Name Short, nhede Core, NiranV Dean, Nogardrevlis Lectar, Oren Hurvitz, Paladin Forzane, paperwork, Penny Patton, Peyton Menges, programmtest, Qwerty Venom, Rebecca Ashbourne, Revolution Smythe, Romka Swallowtail, Sahkolihaa Contepomi, sal Kaligawa, Samm Florian, Satomi Ahn, Sei Lisa, Sempervirens Oddfellow, Shin Wasp, Shyotl Kuhr, Sione Lomu, Skills Hak, StarlightShining, Sunset Faulkes, Testicular Slingshot, Thickbrick Sleaford, Ubit Umarov, Vaalith Jinn, Vincent Sylvester, Whirly Fizzle, Xenhat Liamano, Zwagoth Klaar and others.
+Albatroz Hird, Alexie Birman, Andromeda Rage, Angeldark Raymaker, Angus Boyd, Animats, Armin Weatherwax, Beq Janus, Casper Warden, Chalice Yao, Chaser Zaks, Chorazin Allen, Cron Stardust, Damian Zhaoying, Dan Threebeards, Dawa Gurbux, Denver Maksim, Drake Arconis, Felyza Wishbringer, f0rbidden, Fractured Crystal, Geenz Spad, Gibson Firehawk, Hitomi Tiponi, Inusaito Sayori, Jean Severine, Katharine Berry, Kittin Ninetails, Kool Koolhoven, Lance Corrimal, Lassie, Latif Khalifa, Laurent Bechir, Magne Metaverse LLC, Magus Freston, Manami Hokkigai, MartinRJ Fayray, McCabe Maxstead, Melancholy Lemon, Melysmile, Mimika Oh, Mister Acacia, MorganMegan, mygoditsfullofstars, Mysty Saunders, Nagi Michinaga, Name Short, nhede Core, NiranV Dean, Nogardrevlis Lectar, Oren Hurvitz, Paladin Forzane, paperwork, Penny Patton, Peyton Menges, programmtest, Qwerty Venom, Rebecca Ashbourne, Revolution Smythe, Romka Swallowtail, Sahkolihaa Contepomi, sal Kaligawa, Samm Florian, Satomi Ahn, Sei Lisa, Sempervirens Oddfellow, Shin Wasp, Shyotl Kuhr, Sione Lomu, Skills Hak, StarlightShining, Sunset Faulkes, Testicular Slingshot, Thickbrick Sleaford, Ubit Umarov, Vaalith Jinn, Vincent Sylvester, Whirly Fizzle, Xenhat Liamano, Zwagoth Klaar and others.
                </text>
                <text
                 follows="top|left"
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@ -2,7 +2,7 @@
 <floater layout="topleft"
         name="env_adjust_snapshot"
         help_topic="fs_personal_lighting"
-         save_rect="false"
+         save_rect="true"
         title="Personal Lighting"
         width="845"
         height="280"
--- a/indra/newview/skins/default/xui/en/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/en/menu_favorites.xml
@ -12,6 +12,18 @@
         function="Favorites.DoToSelected"
         parameter="open" />
    </menu_item_call>
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="Show On Map">
+        <menu_item_call.on_click
+         function="Favorites.DoToSelected"
+         parameter="show_on_map" />
+    </menu_item_call>
+
+    <menu_item_separator
+     layout="topleft" />
+
    <menu_item_call
     label="View/Edit Landmark"
     layout="topleft"
@ -28,14 +40,6 @@
         function="Favorites.DoToSelected"
         parameter="move_to_landmarks" />
    </menu_item_call>
-    <menu_item_call
-     label="Show on Map"
-     layout="topleft"
-     name="Show On Map">
-        <menu_item_call.on_click
-         function="Favorites.DoToSelected"
-         parameter="show_on_map" />
-    </menu_item_call>
    <menu_item_call
     label="Copy SLurl"
     layout="topleft"
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
@ -17,6 +17,19 @@
         function="Places.LandmarksGear.Enable"
         parameter="teleport" />
    </menu_item_call>
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <on_click
+         function="Places.LandmarksGear.Custom.Action"
+         parameter="show_on_map" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="show_on_map" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
    <menu_item_call
     label="Share"
     layout="topleft"
@ -61,17 +74,6 @@
       function="Places.LandmarksGear.Enable"
       parameter="move_to_favorites" />
    </menu_item_call>
-    <menu_item_call
-     label="Show on Map"
-     layout="topleft"
-     name="show_on_map">
-        <on_click
-         function="Places.LandmarksGear.Custom.Action"
-         parameter="show_on_map" />
-        <on_enable
-         function="Places.LandmarksGear.Enable"
-         parameter="show_on_map" />
-    </menu_item_call>
    <menu_item_call
     label="Copy SLurl"
     layout="topleft"
@ -82,7 +84,7 @@
        <on_enable
         function="Places.LandmarksGear.Enable"
         parameter="copy_slurl" />
-    </menu_item_call> 
+    </menu_item_call>
    <menu_item_call
     label="Create Pick"
     layout="topleft"
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@ -12,7 +12,7 @@
    width="1024">
  <panel.string
     name="real_url" translate="false">
-     http://phoenixviewer.com/app/loginV3/
+     https://phoenixviewer.com/app/loginV3/
  </panel.string>
  <string name="reg_in_client_url" translate="false">
    http://secondlife.eniac15.lindenlab.com/reg-in-client/
--- a/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_backup.xml
@ -306,22 +306,22 @@ Settings groups to be restored (backup will always save all):
        <!-- We must have this entry before the other windlight entries to have the
             windlight/ base folder created. Since we can't hide rows make it so the
             user can't deselect it at least -->
-        <row enabled="false" name="restore_folders_row_windlight">
+        <row enabled="false" name="restore_folders_row_windlight" value="windlight">
            <column type="checkbox" name="restore_global_folders_check" value="true" enabled="false" />
            <column name="restore_global_folders_label">Windlight (Mandatory)</column>
            <column name="value">windlight</column>
        </row>
-        <row name="restore_folders_row_daycycles">
+        <row name="restore_folders_row_daycycles" value="windlight_daycycles">
            <column type="checkbox" name="restore_global_folders_check" value="true" />
            <column name="restore_global_folders_label">Windlight Day Cycles</column>
            <column name="value">windlight/days</column>
        </row>
-        <row name="restore_folders_row_skies">
+        <row name="restore_folders_row_skies" value="windlight_skies">
            <column type="checkbox" name="restore_global_folders_check" value="true" />
            <column name="restore_global_folders_label">Windlight Skies</column>
            <column name="value">windlight/skies</column>
        </row>
-        <row name="restore_folders_row_waters">
+        <row name="restore_folders_row_waters" value="windlight_water">
            <column type="checkbox" name="restore_global_folders_check" value="true" />
            <column name="restore_global_folders_label">Windlight Waters</column>
            <column name="value">windlight/water</column>
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@ -306,20 +306,6 @@
 			 function="Pref.WebBrowserClearCache" />
 		</button>

-		<check_box
-		 enabled="true"
-		 follows="left|top"
-		 height="16"
-		 initial_value="true"
-		 control_name="BrowserPluginsEnabled"
-		 label="Enable plugins"
-		 left="25"
-		 mouse_opaque="true"
-		 name="browser_plugins_enabled"
-		 radio_style="false"
-		 width="200"
-		 top_pad="5"/>
-
 		<check_box
 		 enabled="true"
 		 follows="left|top"
@ -327,7 +313,7 @@
 		 initial_value="true"
 		 control_name="BrowserJavascriptEnabled"
 		 label="Enable Javascript"
-		 left_delta="0"
+		 left="25"
 		 mouse_opaque="true"
 		 name="browser_javascript_enabled"
 		 radio_style="false"
--- a/indra/newview/skins/default/xui/es/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/es/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Teleportar" name="Teleport To Landmark"/>
+	<menu_item_call label="Mostrar en el mapa" name="Show On Map"/>
 	<menu_item_call label="Ver/Editar el hito" name="Landmark Open"/>
 	<menu_item_call label="Copiar la SLurl" name="Copy slurl"/>
-	<menu_item_call label="Mostrar en el mapa" name="Show On Map"/>
 	<menu_item_call label="Copiar" name="Landmark Copy"/>
 	<menu_item_call label="Pegar" name="Landmark Paste"/>
 	<menu_item_call label="Borrar" name="Delete"/>
--- a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleportar" name="teleport"/>
-	<menu_item_call label="Más información" name="more_info"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
+	<menu_item_call label="Más información" name="more_info"/>
 	<menu_item_call label="Añadir un hito" name="add_landmark"/>
 	<menu_item_call label="Añadir una carpeta" name="add_folder"/>
 	<menu_item_call label="Restaurar ítem" name="restore_item"/>
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@ -19,7 +19,6 @@
 				<combo_box.item label="Cinco ventanas" name="web_5"/>
 				<combo_box.item label="Diez ventanas" name="web_10"/>
 			</combo_box>
-			<check_box label="Activar plugins" name="browser_plugins_enabled"/>
 			<check_box label="Aceptar las &apos;cookies&apos;" name="cookies_enabled"/>
 			<check_box label="Activar Javascript" name="browser_javascript_enabled"/>
 			<check_box label="Permitir las ventanas emergentes en el navegador" name="media_popup_enabled"/>
--- a/indra/newview/skins/default/xui/fr/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/fr/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Téléporter" name="Teleport To Landmark"/>
+	<menu_item_call label="Voir sur la carte" name="Show On Map"/>
 	<menu_item_call label="Voir/Modifier le repère" name="Landmark Open"/>
 	<menu_item_call label="Copier la SLurl" name="Copy slurl"/>
-	<menu_item_call label="Voir sur la carte" name="Show On Map"/>
 	<menu_item_call label="Copier" name="Landmark Copy"/>
 	<menu_item_call label="Coller" name="Landmark Paste"/>
 	<menu_item_call label="Supprimer" name="Delete"/>
--- a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Téléporter" name="teleport"/>
-	<menu_item_call label="Plus d'informations" name="more_info"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Plus d'informations" name="more_info"/>
 	<menu_item_call label="Créer un repère" name="add_landmark"/>
 	<menu_item_call label="Créer un dossier" name="add_folder"/>
 	<menu_item_call label="Restaurer l'objet" name="restore_item"/>
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@ -11,7 +11,27 @@
 		<menu_item_call label="Favoris..." name="Picks"/>
 		<menu_item_call label="Expériences..." name="Experiences"/>
 		<menu_item_call label="Profil..." name="Profile"/>
-		<menu_item_check label="Apparence..." name="ChangeOutfit"/>
+		<menu_item_call label="Mon apparence" name="NowWearing" />
+		<menu_item_check label="Tenues" name="ChangeOutfit"/>
+		<menu label="Enlever" name="Take Off &gt;">
+			<menu label="Vêtements" name="Clothes &gt;">
+				<menu_item_call label="Chemise" name="Shirt" />
+				<menu_item_call label="Pantalons" name="Pants" />
+				<menu_item_call label="Jupe" name="Skirt" />
+				<menu_item_call label="Chaussures" name="Shoes" />
+				<menu_item_call label="Chaussettes" name="Socks" />
+				<menu_item_call label="Veste" name="Jacket" />
+				<menu_item_call label="Gants" name="Gloves" />
+				<menu_item_call label="Maillot de corps" name="Self Undershirt" />
+				<menu_item_call label="Caleçon" name="Self Underpants" />
+				<menu_item_call label="Tatouage" name="Self Tattoo" />
+				<menu_item_call label="Physiques" name="Self Physics" />
+				<menu_item_call label="Couches alpha" name="Self Alpha" />
+				<menu_item_call label="Tous les vêtements" name="All Clothes" />
+			</menu>
+			<menu label="Détacher" name="Avatar Detach" />
+			<menu_item_call label="Tout détacher" name="Detach All" />
+		</menu>
 		<menu_item_call label="Choisir un avatar..." name="Avatar Picker"/>
 		<menu label="Déplacements" name="Movement">
 			<menu_item_call label="M&apos;asseoir" name="Sit Down Here"/>
@ -40,7 +60,7 @@
 		</menu>
 		<menu_item_call label="Photo" name="Take Snapshot"/>
 		<menu_item_call label="Suivi des transactions" name="money_tracker"/>
-		<menu_item_call label="Pose Stand..." name="pose_stand"/>
+		<menu_item_call label="Stand de pose..." name="pose_stand"/>
 		<menu_item_call label="Préférences..." name="Preferences"/>
 		<menu_item_call label="Boutons de la barre d'outils" name="Toolbar Buttons"/>
 		<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
@ -97,6 +117,7 @@
 		<menu_item_call label="Définir le domicile ici" name="Set Home to Here"/>
 		<menu_item_call label="Acheter ce terrain" name="Buy Land"/>
 		<menu_item_call label="Mes terrains..." name="My Land"/>
+		<menu_item_call label="Ma maison (Linden Home)" name="Linden Home"/>
 		<menu label="Afficher" name="LandShow">
 			<menu_item_check label="Lignes d&apos;interdiction" name="Ban Lines"/>
 			<menu_item_check label="Balises" name="beacons"/>
@ -233,6 +254,7 @@
 		<menu_item_call label="Rejoindre un groupe d'aide Firestorm" name="firestorm_support_group"/>
 		<menu_item_call label="Horaires des classes Firestorm" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Calendrier des évènements Firestorm" name="Firestorm Events Calendar"/>
+		<menu_item_call label="Guide" name="How To"/>
 		<menu_item_call label="Aide [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="À propos de [CURRENT_GRID]" name="current_grid_about"/>
 		<menu_item_check label="Consulter l'état de la grille" name="Grid Status"/>
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@ -17,6 +17,7 @@
 			<check_box name="FSMarkObjects" label="Renommer les objets sans nom qui parlent avec '(aucun nom)' pour éviter les confusions"/>
 			<check_box label="Rediriger les messages émis avec llOwnerSay dans la fenêtre de débogage de script" name="FSllOwnerSayToScriptDebugWindow_checkbox"/>
 			<check_box label="Afficher des bulles de discussion" name="bubble_text_chat"/>
+			<check_box label="Ne pas afficher les discussions dans la console de discussions à proximité et les toasts" name="FSBubblesHideConsoleAndToasts"/>
 			<check_box label="Afficher l'indicateur de saisie de texte dans les bulles de discussion" name="bubble_text_typing"/>
 			<check_box label="Afficher l'indicateur de saisie de texte dans le nom flottant au-dessus des avatars" name="FSShowTypingStateInNameTag"/>
 			<check_box name="FSSecondsinChatTimestamps" label="Afficher les secondes dans les timestamps [HH:MM:SS]"/>
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@ -24,7 +24,6 @@
 				<combo_box.item label="Dix fenêtres" name="web_10"/>
 			</combo_box>
 			<button label="Vider le cache du navigateur" width="190" name="ClearWebBrowserCache"/>
-			<check_box label="Activer les plugins" name="browser_plugins_enabled"/>
 			<check_box label="Accepter les cookies" name="cookies_enabled"/>
 			<check_box label="Activer JavaScript" name="browser_javascript_enabled"/>
 			<check_box label="Activer les pop-up dans le navigateur" name="media_popup_enabled"/>
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@ -1449,6 +1449,9 @@ http://secondlife.com/support pour vous aider à résoudre ce problème.
 	<string name="BodyPartsRightLeg">
 		Jambe droite
 	</string>
+	<string name="BodyPartsEnhancedSkeleton">
+		Squelette amélioré
+	</string>
 	<string name="GraphicsQualityLow">
 		Faible
 	</string>
--- a/indra/newview/skins/default/xui/it/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/it/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Teleport" name="Teleport To Landmark"/>
+	<menu_item_call label="Mostra sulla mappa" name="Show On Map"/>
 	<menu_item_call label="Vedi/modifica segnaposto" name="Landmark Open"/>
 	<menu_item_call label="Copia SLurl" name="Copy slurl"/>
-	<menu_item_call label="Mostra sulla mappa" name="Show On Map"/>
 	<menu_item_call label="Copia" name="Landmark Copy"/>
 	<menu_item_call label="Incolla" name="Landmark Paste"/>
 	<menu_item_call label="Elimina" name="Delete"/>
--- a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleport" name="teleport"/>
-	<menu_item_call label="Maggiori informazioni" name="more_info"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
+	<menu_item_call label="Maggiori informazioni" name="more_info"/>
 	<menu_item_call label="Aggiungi segnaposto" name="add_landmark"/>
 	<menu_item_call label="Aggiungi cartella" name="add_folder"/>
 	<menu_item_call label="Ripristina oggetto" name="restore_item"/>
--- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
@ -17,7 +17,10 @@
 	<panel name="bottom_panel">
 		<layout_stack name="bottom_panel_ls">
 			<layout_panel name="save_btn_lp">
-				<button label="Salva con nome" name="save_btn"/>
+				<button label="Salva" name="save_btn"/>
+			</layout_panel>
+			<layout_panel name="save_as_btn_lp">
+				<button label="Salva con nome" name="save_as_btn"/>
 			</layout_panel>
 			<layout_panel name="wear_btn_lp">
 				<button label="Indossa" name="wear_btn"/>
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@ -37,7 +37,6 @@
 				<combo_box.item label="Dieci finestre" name="web_10"/>
 			</combo_box>
 			<button label="Cancella cache browser" name="ClearWebBrowserCache"/>
-			<check_box label="Abilita plugin" name="browser_plugins_enabled"/>
 			<check_box label="Accetta cookie" name="cookies_enabled"/>
 			<check_box label="Abilita Javascript" name="browser_javascript_enabled"/>
 			<check_box label="Consenti pop-up nel browser" name="media_popup_enabled"/>
--- a/indra/newview/skins/default/xui/ja/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="テレポート" name="Teleport To Landmark"/>
+	<menu_item_call label="地図に表示" name="Show On Map"/>
 	<menu_item_call label="ランドマークを表示・編集" name="Landmark Open"/>
 	<menu_item_call label="ランドマークに移動" name="Move to Landmarks" />
-	<menu_item_call label="地図に表示" name="Show On Map"/>
 	<menu_item_call label="SLurl をコピー" name="Copy slurl"/>
 	<menu_item_call label="ピックを作成k" name="create_pick" />
 	<menu_item_call label="コピー" name="Landmark Copy"/>
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="テレポート" name="teleport"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="共有" name="share" />
 	<menu_item_call label="ランドマークを見る/編集する" name="more_info"/>
 	<menu_item_call label="ランドマークに移動" name="Move to Landmarks" />
 	<menu_item_call label="お気に入りに移動" name="Move to Favorites" />
-	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="SLurl をコピー" name="copy_slurl"/>
 	<menu_item_call label="ピックを作成" name="create_pick"/>
 	<menu_item_call label="アイテムを復元" name="restore_item"/>
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@ -50,7 +50,6 @@
 				<combo_box.item label="10画面まで" name="web_10"/>
 			</combo_box>
 			<button label="ブラウザキャッシュをクリア" name="ClearWebBrowserCache" />
-			<check_box label="プラグインを有効にする" name="browser_plugins_enabled" />
 			<!--
 			<check_box label="Cookie を受け入れる" name="cookies_enabled" />
 			-->
--- a/indra/newview/skins/default/xui/pl/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_limits.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="scriptlimits" title="Informacje o skrypcie"/>
+<floater name="scriptlimits" title="Informacje o skryptach"/>
--- a/indra/newview/skins/default/xui/pl/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/pl/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Teleportuj" name="Teleport To Landmark"/>
+	<menu_item_call label="Pokaż na mapie" name="Show On Map"/>
 	<menu_item_call label="Zobacz/Edytuj Landmark" name="Landmark Open"/>
 	<menu_item_call label="Przenieś do Landmarków" name="Move to Landmarks" />
-	<menu_item_call label="Pokaż na mapie" name="Show On Map"/>
 	<menu_item_call label="Kopiuj SLurl" name="Copy slurl"/>
    <menu_item_call label="Utwórz Miejsce" name="create_pick" />
 	<menu_item_call label="Kopiuj" name="Landmark Copy"/>
--- a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teleportuj" name="teleport" />
+	<menu_item_call label="Pokaż na mapie" name="show_on_map" />
 	<menu_item_call label="Udostępnij" name="share" />
 	<menu_item_call label="Pokaż/edytuj Landmark" name="more_info" />
 	<menu_item_call label="Przenieś do Landmarków" name="Move to Landmarks" />
 	<menu_item_call label="Przenieś do Ulubionych" name="Move to Favorites" />
-	<menu_item_call label="Pokaż na mapie" name="show_on_map" />
 	<menu_item_call label="Kopiuj SLurl" name="copy_slurl" />
 	<menu_item_call label="Stwórz Miejsce" name="create_pick" />
 	<menu_item_call label="Przywróć obiekt" name="restore_item" />
--- a/indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Outfit Gallery">
 	<string name="outfit_photo_string">
-		Zdjęcie stroju: "[OUTFIT_NAME]"
+		Zdjecie stroju: "[OUTFIT_NAME]"
 	</string>
 	<string name="no_outfits_msg">
 		Nie ma jeszcze żadnych strojów. Spróbuj [secondlife:///app/search/all/ Wyszukiwarki]
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@ -31,10 +31,12 @@
 				<combo_box.item label="Dziesięć okien" name="web_10"/>
 			</combo_box>
 			<button label="Wyczyść bufor przeglądarki WWW" name="ClearWebBrowserCache" width="195"/>
-			<check_box label="Włącz wtyczki" name="browser_plugins_enabled"/>
 			<check_box label="Włącz Javascript" name="browser_javascript_enabled"/>
 			<check_box label="Włącz wyskakujące okienka przeglądarki mediów" name="media_popup_enabled"/>
-			<button label="Dostosuj ustawienia proxy" label_selected="Dostosuj ustawienia proxy" name="set_proxy"/>
+			<!-- <button label="Dostosuj ustawienia proxy" label_selected="Dostosuj ustawienia proxy" name="set_proxy"/> -->
+			<text name="proxy_settings_label">
+				Zostaną użyte ustawienia proxy Twojego systemu.
+			</text>
 			<text name="home_page_label_l">
 				Strona startowa:
 			</text>
--- a/indra/newview/skins/default/xui/pt/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/pt/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Teletransportar" name="Teleport To Landmark"/>
+	<menu_item_call label="Mostrar no mapa" name="Show On Map"/>
 	<menu_item_call label="Ver/Editar marco" name="Landmark Open"/>
 	<menu_item_call label="Copiar SLurl" name="Copy slurl"/>
-	<menu_item_call label="Mostrar no mapa" name="Show On Map"/>
 	<menu_item_call label="Copiar" name="Landmark Copy"/>
 	<menu_item_call label="Colar" name="Landmark Paste"/>
 	<menu_item_call label="Excluir" name="Delete"/>
--- a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Teletransportar" name="teleport"/>
-	<menu_item_call label="Mais informações" name="more_info"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
+	<menu_item_call label="Mais informações" name="more_info"/>
 	<menu_item_call label="Adicionar marco" name="add_landmark"/>
 	<menu_item_call label="Adicionar pasta" name="add_folder"/>
 	<menu_item_call label="Restaurar item" name="restore_item"/>
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@ -10,7 +10,6 @@
 			<text name="Web:">
 				Web:
 			</text>
-			<check_box label="Habilitar plugins" name="browser_plugins_enabled"/>
 			<check_box label="Aceitar cookies" name="cookies_enabled"/>
 			<check_box label="Habilitar Javascript" name="browser_javascript_enabled"/>
 			<check_box label="Ativar pop-ups no navegador de mídia" name="media_popup_enabled"/>
--- a/indra/newview/skins/default/xui/ru/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ru/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Телепортироваться" name="Teleport To Landmark"/>
+	<menu_item_call label="Показать на карте" name="Show On Map"/>
 	<menu_item_call label="Открыть/Править закладку" name="Landmark Open"/>
 	<menu_item_call label="Переместить в Закладки" name="Move to Landmarks"/>
-	<menu_item_call label="Показать на карте" name="Show On Map"/>
 	<menu_item_call label="Копировать SLurl" name="Copy slurl"/>
 	<menu_item_call label="Создать Место" name="create_pick"/>
 	<menu_item_call label="Копировать" name="Landmark Copy"/>
--- a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Телепортироваться" name="teleport"/>
+	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Поделиться" name="share"/>
 	<menu_item_call label="Смотреть / Править" name="more_info"/>
 	<menu_item_call label="Переместить в Закладки" name="Move to Landmarks"/>
 	<menu_item_call label="Переместить в Избранное" name="Move to Favorites"/>
-	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Копировать SLurl" name="copy_slurl"/>
 	<menu_item_call label="Создать место" name="create_pick"/>
 	<menu_item_call label="Восстановить объект" name="restore_item"/>
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@ -559,6 +559,7 @@
 	</notification>
 	<notification name="ChangeSkin">
 		Смена темы вступит в силу после перезапуска [APP_NAME].
+Вы хотите закрыть программу просмотра и снова запустить ее вручную, чтобы применить это изменение?
 		<usetemplate name="okcancelbuttons" notext="Позже" yestext="Перезапуск"/>
 	</notification>
 	<notification name="ChangeLanguage">
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@ -31,11 +31,13 @@
 				<combo_box.item label="Десять окон" name="web_10"/>
 			</combo_box>
 			<button label="Очистить кэш браузера" name="ClearWebBrowserCache" width="195"/>
-			<check_box label="Разрешить плагины" name="browser_plugins_enabled"/>
 			<check_box label="Принимать Cookies" name="cookies_enabled"/>
 			<check_box label="Включить Javascript" name="browser_javascript_enabled"/>
 			<check_box label="Включить всплывающие окна медиа" name="media_popup_enabled"/>
-			<button label="Настройка параметров прокси" label_selected="Настройка параметров прокси" name="set_proxy"/>
+			<!-- <button label="Настройка параметров прокси" label_selected="Настройка параметров прокси" name="set_proxy"/> -->
+			<text name="proxy_settings_label">
+				Будут использованы существующие настройки прокси вашей системы.
+			</text>
 			<text name="home_page_label_l">
 				Домашняя страница браузера:
 			</text>
--- a/indra/newview/skins/default/xui/tr/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/tr/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="Işınla" name="Teleport To Landmark"/>
+	<menu_item_call label="Haritada Göster" name="Show On Map"/>
 	<menu_item_call label="Yer İmini Görüntüle/Düzenle" name="Landmark Open"/>
 	<menu_item_call label="SLurl&apos;i Kopyala" name="Copy slurl"/>
-	<menu_item_call label="Haritada Göster" name="Show On Map"/>
 	<menu_item_call label="Kopyala" name="Landmark Copy"/>
 	<menu_item_call label="Yapıştır" name="Landmark Paste"/>
 	<menu_item_call label="Sil" name="Delete"/>
--- a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="Işınla" name="teleport"/>
-	<menu_item_call label="Ek Bilgi" name="more_info"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
+	<menu_item_call label="Ek Bilgi" name="more_info"/>
 	<menu_item_call label="Yer İmi Ekle" name="add_landmark"/>
 	<menu_item_call label="Klasör Ekle" name="add_folder"/>
 	<menu_item_call label="Öğeyi Geri Yükle" name="restore_item"/>
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@ -7,7 +7,6 @@
 			</text>
 			<check_box label="Özel port" name="connection_port_enabled"/>
 			<spinner label="Port numarası:" name="connection_port" width="160" label_width="85"/>
-			<check_box label="Eklentileri etkinleştir" name="browser_plugins_enabled"/>
 			<check_box label="Çerezleri kabul et" name="cookies_enabled"/>
 			<check_box label="Javascript&apos;i etkinleştir" name="browser_javascript_enabled"/>
 			<check_box label="Ortam tarayıcısı açılır pencerelerini etkinleştir" name="media_popup_enabled"/>
--- a/indra/newview/skins/default/xui/zh/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/zh/menu_favorites.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
 	<menu_item_call label="瞬間傳送" name="Teleport To Landmark"/>
+	<menu_item_call label="顯示在地圖上" name="Show On Map"/>
 	<menu_item_call label="察看 / 編輯 地標" name="Landmark Open"/>
 	<menu_item_call label="覆製 SLurl" name="Copy slurl"/>
-	<menu_item_call label="顯示在地圖上" name="Show On Map"/>
 	<menu_item_call label="恚庨" name="Landmark Copy"/>
 	<menu_item_call label="貼上" name="Landmark Paste"/>
 	<menu_item_call label="刪除" name="Delete"/>
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_ladmark_gear">
 	<menu_item_call label="瞬間傳送" name="teleport"/>
-	<menu_item_call label="更多資訊" name="more_info"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
+	<menu_item_call label="更多資訊" name="more_info"/>
 	<menu_item_call label="添加地標" name="add_landmark"/>
 	<menu_item_call label="添加資料夾" name="add_folder"/>
 	<menu_item_call label="還原物品" name="restore_item"/>
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@ -10,7 +10,6 @@
 			<text name="Web:">
 				網頁:
 			</text>
-			<check_box label="啟用外掛" name="browser_plugins_enabled"/>
 			<check_box label="接受 cookies" name="cookies_enabled"/>
 			<check_box label="啟用 Javascript" name="browser_javascript_enabled"/>
 			<check_box label="啟用媒體瀏覽的突顯式視窗" name="media_popup_enabled"/>
--- a/indra/newview/skins/latency/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/latency/xui/en/panel_fs_login.xml
@ -15,7 +15,7 @@
     name="real_url"
     translate="false"
    >
-        http://phoenixviewer.com/app/loginV3/
+        https://phoenixviewer.com/app/loginV3/
    </panel.string>
    <string
     name="reg_in_client_url"
--- a/indra/newview/skins/starlight/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_fs_login.xml
@ -12,7 +12,7 @@
    width="1024">
  <panel.string
     name="real_url" translate="false">
-     http://phoenixviewer.com/app/loginV3/
+     https://phoenixviewer.com/app/loginV3/
  </panel.string>
  <string name="reg_in_client_url" translate="false">
    http://secondlife.eniac15.lindenlab.com/reg-in-client/
--- a/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
@ -12,7 +12,7 @@
    width="1024">
  <panel.string
     name="real_url" translate="false">
-     http://phoenixviewer.com/app/loginV3/
+     https://phoenixviewer.com/app/loginV3/
  </panel.string>
  <string name="reg_in_client_url" translate="false">
    http://secondlife.eniac15.lindenlab.com/reg-in-client/
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@ -1917,18 +1917,14 @@ class LinuxManifest(ViewerManifest):
            self.path( "v8_context_snapshot.bin" )

        with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="bin"):
-            self.path( "cef.pak" )
-            self.path( "cef_extensions.pak" )
-            self.path( "cef_100_percent.pak" )
-            self.path( "cef_200_percent.pak" )
-            self.path( "devtools_resources.pak" )
+            self.path( "chrome_100_percent.pak" )
+            self.path( "chrome_200_percent.pak" )
+            self.path( "resources.pak" )
            self.path( "icudtl.dat" )
        with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="lib"):
-            self.path( "cef.pak" )
-            self.path( "cef_extensions.pak" )
-            self.path( "cef_100_percent.pak" )
-            self.path( "cef_200_percent.pak" )
-            self.path( "devtools_resources.pak" )
+            self.path( "chrome_100_percent.pak" )
+            self.path( "chrome_200_percent.pak" )
+            self.path( "resources.pak" )
            self.path( "icudtl.dat" )

        with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')):