Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05

author: Erik Kundiman <erik@megapahit.org> 2025-04-19 22:07:21 +0800
committer: Erik Kundiman <erik@megapahit.org> 2025-04-19 22:12:00 +0800
commit: ba20ac5718de63c499fe08ea4079695962dc2f17 (patch)
tree: 88c7b17304445278adb73135e2794a2afa3aa20f /indra/newview
parent: ad9c801edb13568657c0964ebfb74257da6d9e00 (diff)
parent: 11cd9b91a2cf3e71cb6dae0a08dff2b878163ce8 (diff)
224 files changed, 4560 insertions, 1637 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 8d7f37142f..681b7a050e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -349,6 +349,7 @@ set(viewer_SOURCE_FILES
     llhudeffectpointat.cpp
     llhudeffecttrail.cpp
     llhudeffectblob.cpp
+    llhudeffectresetskeleton.cpp
     llhudicon.cpp
     llhudmanager.cpp
     llhudnametag.cpp
@@ -1026,6 +1027,7 @@ set(viewer_HEADER_FILES
     llhudeffectpointat.h
     llhudeffecttrail.h
     llhudeffectblob.h
+    llhudeffectresetskeleton.h
     llhudicon.h
     llhudmanager.h
     llhudnametag.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f8487c020e..e39afd4715 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -113,7 +113,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>300.0</real>
+      <real>300</real>
     </map>
     <key>AckCollectTime</key>
     <map>
@@ -1875,6 +1875,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+    <key>DebugSelectionLODs</key>
+    <map>
+        <key>Comment</key>
+        <string>Force selection to show specific LOD, -1 for off, 0 - lowest, 4 - high.</string>
+        <key>Persist</key>
+        <integer>0</integer>
+        <key>Type</key>
+        <string>S32</string>
+        <key>Value</key>
+        <integer>-1</integer>
+    </map>
   <key>AnimatedObjectsAllowLeftClick</key>
   <map>
     <key>Comment</key>
@@ -14579,10 +14590,32 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>OutfitGallerySortByName</key>
+    <key>OutfitGallerySortOrder</key>
+    <map>
+      <key>Comment</key>
+      <string>Gallery sorting: 0 - sort outfits by name, 1 - images frst, 2 - favorites first</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>OutfitListSortOrder</key>
+    <map>
+      <key>Comment</key>
+      <string>How outfit list in Avatar's floater is sorted. 0 - by name 1 - favorites to top</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>OutfitListFilterFullList</key>
     <map>
       <key>Comment</key>
-      <string>Always sort outfits by name in Outfit Gallery</string>
+      <string> 0 - show only matches. 1 - show all items in outfit as long as outfit or item inside matches.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -16463,6 +16496,50 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>InventoryFavoritesUseStar</key>
+  <map>
+    <key>Comment</key>
+    <string>Show star near favorited items in inventory</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>InventoryFavoritesUseHollowStar</key>
+  <map>
+    <key>Comment</key>
+    <string>Show star near folders that contain favorites</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>InventoryFavoritesColorText</key>
+  <map>
+    <key>Comment</key>
+    <string>render favorite items using InventoryFavoriteText as color</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>InventoryAddAttachmentBehavior</key>
+  <map>
+    <key>Comment</key>
+    <string>Defines behavior when hitting return on an inventory item</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>StatsReportMaxDuration</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 80a4bec57f..8361a50b6c 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -329,7 +329,7 @@
     <key>KeepConversationLogTranscripts</key>
     	<map>
       	<key>Comment</key>
-      		<string>Keep a conversation log and transcripts</string>
+      		<string>Keep a conversation log and transcripts 2 - both, 1 - logs, 0 - none</string>
       	<key>Persist</key>
       		<integer>1</integer>
       	<key>Type</key>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/tonemapUtilF.glsl b/indra/newview/app_settings/shaders/class1/deferred/tonemapUtilF.glsl
index a63b8d7c2b..774ccb6baf 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/tonemapUtilF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/tonemapUtilF.glsl
@@ -117,27 +117,34 @@ uniform float exposure;
 uniform float tonemap_mix;
 uniform int tonemap_type;
 
+
 vec3 toneMap(vec3 color)
 {
 #ifndef NO_POST
-    float exp_scale = texture(exposureMap, vec2(0.5,0.5)).r;
-
-    color *= exposure * exp_scale;
+    vec3 linear_input_color = color;
 
-    vec3 clamped_color = clamp(color.rgb, vec3(0.0), vec3(1.0));
+    float exp_scale = texture(exposureMap, vec2(0.5,0.5)).r;
+    float final_exposure = exposure * exp_scale;
+    vec3 exposed_color = color * final_exposure;
 
+    vec3 tonemapped_color = exposed_color;
     switch(tonemap_type)
     {
     case 0:
-        color = PBRNeutralToneMapping(color);
+        tonemapped_color = PBRNeutralToneMapping(exposed_color);
         break;
     case 1:
-        color = toneMapACES_Hill(color);
+        tonemapped_color = toneMapACES_Hill(exposed_color);
         break;
     }
 
-    // mix tonemapped and linear here to provide adjustment
-    color = mix(clamped_color, color, tonemap_mix);
+    vec3 exposed_linear_input = linear_input_color * final_exposure;
+    color = mix(exposed_linear_input, tonemapped_color, tonemap_mix);
+
+    color = clamp(color, 0.0, 1.0);
+#else
+    color *= exposure * texture(exposureMap, vec2(0.5,0.5)).r;
+    color = clamp(color, 0.0, 1.0);
 #endif
 
     return color;
@@ -147,20 +154,24 @@ vec3 toneMap(vec3 color)
 vec3 toneMapNoExposure(vec3 color)
 {
 #ifndef NO_POST
-    vec3 clamped_color = clamp(color.rgb, vec3(0.0), vec3(1.0));
+    vec3 linear_input_color = color;
 
+    vec3 tonemapped_color = color;
     switch(tonemap_type)
     {
     case 0:
-        color = PBRNeutralToneMapping(color);
+        tonemapped_color = PBRNeutralToneMapping(color);
         break;
     case 1:
-        color = toneMapACES_Hill(color);
+        tonemapped_color = toneMapACES_Hill(color);
         break;
     }
 
-    // mix tonemapped and linear here to provide adjustment
-    color = mix(clamped_color, color, tonemap_mix);
+    color = mix(linear_input_color, tonemapped_color, tonemap_mix);
+
+    color = clamp(color, 0.0, 1.0);
+#else
+     color = clamp(color, 0.0, 1.0);
 #endif
 
     return color;
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp
index bf3fada3bd..a38ede592b 100644
--- a/indra/newview/gltfscenemanager.cpp
+++ b/indra/newview/gltfscenemanager.cpp
@@ -220,6 +220,7 @@ void GLTFSceneManager::uploadSelection()
                         LLFloaterPerms::getGroupPerms("Uploads"),
                         LLFloaterPerms::getEveryonePerms("Uploads"),
                         expected_upload_cost,
+                        LLUUID::null,
                         false,
                         finish,
                         failure));
@@ -283,6 +284,7 @@ void GLTFSceneManager::uploadSelection()
                 LLFloaterPerms::getGroupPerms("Uploads"),
                 LLFloaterPerms::getEveryonePerms("Uploads"),
                 expected_upload_cost,
+                LLUUID::null,
                 false,
                 finish,
                 failure));
@@ -559,6 +561,7 @@ void GLTFSceneManager::update()
                 LLFloaterPerms::getGroupPerms("Uploads"),
                 LLFloaterPerms::getEveryonePerms("Uploads"),
                 expected_upload_cost,
+                LLUUID::null,
                 false,
                 finish,
                 failure));
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 2161dbe19e..085155714a 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -121,8 +121,8 @@ const F32 MIN_FIDGET_TIME = 8.f; // seconds
 const F32 MAX_FIDGET_TIME = 20.f; // seconds
 
 const S32 UI_FEATURE_VERSION = 1;
-// For version 1: 1 - inventory, 2 - gltf
-const S32 UI_FEATURE_FLAGS = 3;
+// For version 1, flag holds: 1 - inventory thumbnails, 2 - gltf, 4 - inventory favorites
+const S32 UI_FEATURE_FLAGS = 7;
 
 // The agent instance.
 LLAgent gAgent;
@@ -223,7 +223,6 @@ private:
     LLVector3d mPosGlobal;
 };
 
-
 class LLTeleportRequestViaLocationLookAt : public LLTeleportRequestViaLocation
 {
 public:
@@ -604,7 +603,7 @@ void LLAgent::getFeatureVersionAndFlags(S32& version, S32& flags)
     if (feature_version.isInteger())
     {
         version = feature_version.asInteger();
-        flags = 1; // inventory flag
+        flags = 3; // show 'favorites' notification
     }
     else if (feature_version.isMap())
     {
@@ -630,13 +629,8 @@ void LLAgent::showLatestFeatureNotification(const std::string key)
 
         if (key == "inventory")
         {
-            // Notify user about new thumbnail support
-            flag = 1;
-        }
-
-        if (key == "gltf")
-        {
-            flag = 2;
+            // Notify user about new favorites support
+            flag = 4;
         }
 
         if ((flags & flag) == 0)
@@ -843,7 +837,6 @@ void LLAgent::movePitch(F32 mag)
     }
 }
 
-
 // Does this parcel allow you to fly?
 bool LLAgent::canFly()
 {
@@ -923,7 +916,6 @@ void LLAgent::setFlying(bool fly, bool fail_sound)
     LLFloaterMove::setFlyingMode(fly);
 }
 
-
 // UI based mechanism of setting fly state
 //-----------------------------------------------------------------------------
 // toggleFlying()
@@ -1002,7 +994,6 @@ void LLAgent::capabilityReceivedCallback(const LLUUID &region_id, LLViewerRegion
     }
 }
 
-
 //-----------------------------------------------------------------------------
 // setRegion()
 //-----------------------------------------------------------------------------
@@ -1108,7 +1099,6 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
     mRegionChangedSignal();
 }
 
-
 //-----------------------------------------------------------------------------
 // getRegion()
 //-----------------------------------------------------------------------------
@@ -1117,7 +1107,6 @@ LLViewerRegion *LLAgent::getRegion() const
     return mRegionp;
 }
 
-
 LLHost LLAgent::getRegionHost() const
 {
     if (mRegionp)
@@ -1148,7 +1137,6 @@ bool LLAgent::inPrelude()
     return mRegionp && mRegionp->isPrelude();
 }
 
-
 std::string LLAgent::getRegionCapability(const std::string &name)
 {
     if (!mRegionp)
@@ -1157,7 +1145,6 @@ std::string LLAgent::getRegionCapability(const std::string &name)
     return mRegionp->getCapability(name);
 }
 
-
 //-----------------------------------------------------------------------------
 // canManageEstate()
 //-----------------------------------------------------------------------------
@@ -1185,7 +1172,6 @@ void LLAgent::sendMessage()
     gMessageSystem->sendMessage(mRegionp->getHost());
 }
 
-
 //-----------------------------------------------------------------------------
 // sendReliableMessage()
 //-----------------------------------------------------------------------------
@@ -1219,7 +1205,6 @@ LLVector3 LLAgent::getVelocity() const
     }
 }
 
-
 //-----------------------------------------------------------------------------
 // setPositionAgent()
 //-----------------------------------------------------------------------------
@@ -1293,7 +1278,6 @@ const LLVector3 &LLAgent::getPositionAgent()
     }
     }
 
-
     return mFrameAgent.getOrigin();
 }
 
@@ -1302,7 +1286,6 @@ boost::signals2::connection LLAgent::whenPositionChanged(position_signal_t::slot
     return mOnPositionChanged.connect(fn);
 }
 
-
 //-----------------------------------------------------------------------------
 // getRegionsVisited()
 //-----------------------------------------------------------------------------
@@ -1319,7 +1302,6 @@ F64 LLAgent::getDistanceTraveled() const
     return mDistanceTraveled;
 }
 
-
 //-----------------------------------------------------------------------------
 // getPosAgentFromGlobal()
 //-----------------------------------------------------------------------------
@@ -1330,7 +1312,6 @@ LLVector3 LLAgent::getPosAgentFromGlobal(const LLVector3d &pos_global) const
     return pos_agent;
 }
 
-
 //-----------------------------------------------------------------------------
 // getPosGlobalFromAgent()
 //-----------------------------------------------------------------------------
@@ -1346,7 +1327,6 @@ void LLAgent::sitDown()
     setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 }
 
-
 //-----------------------------------------------------------------------------
 // resetAxes()
 //-----------------------------------------------------------------------------
@@ -1355,7 +1335,6 @@ void LLAgent::resetAxes()
     mFrameAgent.resetAxes();
 }
 
-
 // Copied from LLCamera::setOriginAndLookAt
 // Look_at must be unit vector
 //-----------------------------------------------------------------------------
@@ -1384,7 +1363,6 @@ void LLAgent::resetAxes(const LLVector3 &look_at)
     mFrameAgent.setAxes(look_at, left, up);
 }
 
-
 //-----------------------------------------------------------------------------
 // rotate()
 //-----------------------------------------------------------------------------
@@ -1393,7 +1371,6 @@ void LLAgent::rotate(F32 angle, const LLVector3 &axis)
     mFrameAgent.rotate(angle, axis);
 }
 
-
 //-----------------------------------------------------------------------------
 // rotate()
 //-----------------------------------------------------------------------------
@@ -1402,7 +1379,6 @@ void LLAgent::rotate(F32 angle, F32 x, F32 y, F32 z)
     mFrameAgent.rotate(angle, x, y, z);
 }
 
-
 //-----------------------------------------------------------------------------
 // rotate()
 //-----------------------------------------------------------------------------
@@ -1411,7 +1387,6 @@ void LLAgent::rotate(const LLMatrix3 &matrix)
     mFrameAgent.rotate(matrix);
 }
 
-
 //-----------------------------------------------------------------------------
 // rotate()
 //-----------------------------------------------------------------------------
@@ -1420,7 +1395,6 @@ void LLAgent::rotate(const LLQuaternion &quaternion)
     mFrameAgent.rotate(quaternion);
 }
 
-
 //-----------------------------------------------------------------------------
 // getReferenceUpVector()
 //-----------------------------------------------------------------------------
@@ -1449,7 +1423,6 @@ LLVector3 LLAgent::getReferenceUpVector()
     return up_vector;
 }
 
-
 // Radians, positive is forward into ground
 //-----------------------------------------------------------------------------
 // pitch()
@@ -1493,7 +1466,6 @@ void LLAgent::pitch(F32 angle)
     }
 }
 
-
 //-----------------------------------------------------------------------------
 // roll()
 //-----------------------------------------------------------------------------
@@ -1502,7 +1474,6 @@ void LLAgent::roll(F32 angle)
     mFrameAgent.roll(angle);
 }
 
-
 //-----------------------------------------------------------------------------
 // yaw()
 //-----------------------------------------------------------------------------
@@ -1514,7 +1485,6 @@ void LLAgent::yaw(F32 angle)
     }
 }
 
-
 // Returns a quat that represents the rotation of the agent in the absolute frame
 //-----------------------------------------------------------------------------
 // getQuat()
@@ -1540,7 +1510,6 @@ void LLAgent::setControlFlags(U32 mask)
     mControlFlags |= mask;
 }
 
-
 //-----------------------------------------------------------------------------
 // clearControlFlags()
 //-----------------------------------------------------------------------------
@@ -1628,7 +1597,6 @@ bool LLAgent::isDoNotDisturb() const
     return mIsDoNotDisturb;
 }
 
-
 //-----------------------------------------------------------------------------
 // startAutoPilotGlobal()
 //-----------------------------------------------------------------------------
@@ -1734,7 +1702,6 @@ void LLAgent::startAutoPilotGlobal(
     mAutoPilotNoProgressFrameCount = 0;
 }
 
-
 //-----------------------------------------------------------------------------
 // setAutoPilotTargetGlobal
 //-----------------------------------------------------------------------------
@@ -1788,7 +1755,6 @@ void LLAgent::startFollowPilot(const LLUUID &leader_id, bool allow_flying, F32 s
                          allow_flying);
 }
 
-
 //-----------------------------------------------------------------------------
 // stopAutoPilot()
 //-----------------------------------------------------------------------------
@@ -1830,7 +1796,6 @@ void LLAgent::stopAutoPilot(bool user_cancel)
     }
 }
 
-
 // Returns necessary agent pitch and yaw changes, radians.
 //-----------------------------------------------------------------------------
 // autoPilot()
@@ -2019,7 +1984,6 @@ void LLAgent::autoPilot(F32 *delta_yaw)
     }
 }
 
-
 //-----------------------------------------------------------------------------
 // propagate()
 //-----------------------------------------------------------------------------
@@ -2040,18 +2004,19 @@ void LLAgent::propagate(const F32 dt)
     }
 
     // handle rotation based on keyboard levels
-    constexpr F32 YAW_RATE = 90.f * DEG_TO_RAD;                // radians per second
-    F32 angle = YAW_RATE * gAgentCamera.getYawKey() * dt;
-    if (fabs(angle) > 0.0f)
+    if (fabs(dt) > 1e-6)
     {
-        yaw(angle);
-    }
+        if (fabs(gAgentCamera.getYawKey()) > 1e-6)
+        {
+            static const F32 YAW_RATE = 90.f * DEG_TO_RAD;   // radians per second
+            yaw(YAW_RATE * gAgentCamera.getYawKey() * dt);
+        }
 
-    constexpr F32 PITCH_RATE = 90.f * DEG_TO_RAD;            // radians per second
-    angle = PITCH_RATE * gAgentCamera.getPitchKey() * dt;
-    if (fabs(angle) > 0.0f)
-    {
-        pitch(angle);
+        if (fabs(gAgentCamera.getPitchKey()) > 1e-6)
+        {
+            static const F32 PITCH_RATE = 90.f * DEG_TO_RAD; // radians per second
+            pitch(PITCH_RATE * gAgentCamera.getPitchKey() * dt);
+        }
     }
 
     // handle auto-land behavior
@@ -2213,7 +2178,6 @@ void LLAgent::clearRenderState(U8 clearstate)
     mRenderState &= ~clearstate;
 }
 
-
 //-----------------------------------------------------------------------------
 // getRenderState()
 //-----------------------------------------------------------------------------
@@ -2255,6 +2219,7 @@ void LLAgent::endAnimationUpdateUI()
     {
         return;
     }
+
     if (gAgentCamera.getCameraMode() == gAgentCamera.getLastCameraMode())
     {
         // We're already done endAnimationUpdateUI for this transition.
@@ -2320,7 +2285,6 @@ void LLAgent::endAnimationUpdateUI()
             mViewsPushed = false;
         }
 
-
         gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR);
         if( gMorphView )
         {
@@ -2952,7 +2916,6 @@ void LLAgent::sendMaturityPreferenceToServer(U8 pPreferredMaturity)
     }
 }
 
-
 void LLAgent::processMaturityPreferenceFromServer(const LLSD &result, U8 perferredMaturity)
 {
     U8 maturity = SIM_ACCESS_MIN;
@@ -3022,7 +2985,6 @@ void LLAgent::changeInterestListMode(const std::string &new_mode)
     }
 }
 
-
 bool LLAgent::requestPostCapability(const std::string &capName, LLSD &postData, httpCallback_t cbSuccess, httpCallback_t cbFailure)
 {
     if (getRegion())
@@ -3349,7 +3311,6 @@ void LLAgent::sendAnimationStateReset()
     sendReliableMessage();
 }
 
-
 // Send a message to the region to revoke sepecified permissions on ALL scripts in the region
 // If the target is an object in the region, permissions in scripts on that object are cleared.
 // If it is the region ID, all scripts clear the permissions for this agent
@@ -4279,7 +4240,6 @@ void LLAgent::onCapabilitiesReceivedAfterTeleport()
     check_merchant_status();
 }
 
-
 void LLAgent::teleportRequest(
     const U64& region_handle,
     const LLVector3& pos_local,
@@ -4393,7 +4353,6 @@ void LLAgent::doTeleportViaLure(const LLUUID& lure_id, bool godlike)
     }
 }
 
-
 // James Cook, July 28, 2005
 void LLAgent::teleportCancel()
 {
@@ -4518,7 +4477,6 @@ LLAgent::ETeleportState LLAgent::getTeleportState() const
         TELEPORT_NONE : mTeleportState;
 }
 
-
 void LLAgent::setTeleportState(ETeleportState state)
 {
     if (mTeleportRequest && (state != TELEPORT_NONE) && (mTeleportRequest->getStatus() == LLTeleportRequest::kFailed))
@@ -4563,7 +4521,6 @@ void LLAgent::setTeleportState(ETeleportState state)
     }
 }
 
-
 void LLAgent::stopCurrentAnimations()
 {
     LL_DEBUGS("Avatar") << "Stopping current animations" << LL_ENDL;
@@ -4678,7 +4635,6 @@ void LLAgent::stopFidget()
     gAgent.sendAnimationRequests(anims, ANIM_REQUEST_STOP);
 }
 
-
 void LLAgent::requestEnterGodMode()
 {
     LLMessageSystem* msg = gMessageSystem;
@@ -4799,7 +4755,6 @@ void LLAgent::sendAgentUpdateUserInfo(const std::string& directory_visibility)
     }
 }
 
-
 void LLAgent::updateAgentUserInfoCoro(std::string capurl, std::string directory_visibility)
 {
     LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 40cb6f6265..cc4599b310 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -1462,13 +1462,12 @@ void LLAgentCamera::updateCamera()
 //  LL_INFOS() << "Current FOV Zoom: " << mCameraCurrentFOVZoomFactor << " Target FOV Zoom: " << mCameraFOVZoomFactor << " Object penetration: " << mFocusObjectDist << LL_ENDL;
 
     LLVector3 focus_agent = gAgent.getPosAgentFromGlobal(mFocusGlobal);
+    LLVector3 position_agent = gAgent.getPosAgentFromGlobal(camera_pos_global);
 
-    mCameraPositionAgent = gAgent.getPosAgentFromGlobal(camera_pos_global);
+    // Try to move the camera
 
-    // Move the camera
-
-    LLViewerCamera::getInstance()->updateCameraLocation(mCameraPositionAgent, mCameraUpVector, focus_agent);
-    //LLViewerCamera::getInstance()->updateCameraLocation(mCameraPositionAgent, camera_skyward, focus_agent);
+    if (!LLViewerCamera::getInstance()->updateCameraLocation(position_agent, mCameraUpVector, focus_agent))
+        return;
 
     // Change FOV
     LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / (1.f + mCameraCurrentFOVZoomFactor));
@@ -1476,7 +1475,7 @@ void LLAgentCamera::updateCamera()
     // follow camera when in customize mode
     if (cameraCustomizeAvatar())
     {
-        setLookAt(LOOKAT_TARGET_FOCUS, NULL, mCameraPositionAgent);
+        setLookAt(LOOKAT_TARGET_FOCUS, NULL, position_agent);
     }
 
     // update the travel distance stat
@@ -1495,8 +1494,8 @@ void LLAgentCamera::updateCamera()
         LLVector3 head_pos = gAgentAvatarp->mHeadp->getWorldPosition() +
             LLVector3(0.08f, 0.f, 0.05f) * gAgentAvatarp->mHeadp->getWorldRotation() +
             LLVector3(0.1f, 0.f, 0.f) * gAgentAvatarp->mPelvisp->getWorldRotation();
-        LLVector3 diff = mCameraPositionAgent - head_pos;
-        diff = diff * ~gAgentAvatarp->mRoot->getWorldRotation();
+        LLVector3 diff = position_agent - head_pos;
+        diff *= ~gAgentAvatarp->mRoot->getWorldRotation();
 
         LLJoint* torso_joint = gAgentAvatarp->mTorsop;
         LLJoint* chest_joint = gAgentAvatarp->mChestp;
@@ -2266,7 +2265,8 @@ void LLAgentCamera::changeCameraToFollow(bool animate)
         mCameraMode = CAMERA_MODE_FOLLOW;
 
         // bang-in the current focus, position, and up vector of the follow cam
-        mFollowCam.reset(mCameraPositionAgent, LLViewerCamera::getInstance()->getPointOfInterest(), LLVector3::z_axis);
+        const LLViewerCamera& camera = LLViewerCamera::instance();
+        mFollowCam.reset(camera.getOrigin(), camera.getPointOfInterest(), LLVector3::z_axis);
 
         if (gBasicToolset)
         {
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h
index 52571f3c55..d277fd6158 100644
--- a/indra/newview/llagentcamera.h
+++ b/indra/newview/llagentcamera.h
@@ -112,6 +112,7 @@ private:
     //--------------------------------------------------------------------
 public:
     void switchCameraPreset(ECameraPreset preset);
+    ECameraPreset getCameraPreset() const { return mCameraPreset; }
     /** Determines default camera offset depending on the current camera preset */
     LLVector3 getCameraOffsetInitial();
     /** Determines default focus offset depending on the current camera preset */
@@ -138,13 +139,14 @@ private:
     //--------------------------------------------------------------------
 public:
     LLVector3d      getCameraPositionGlobal() const;
-    const LLVector3 &getCameraPositionAgent() const;
+    const LLVector3& getCameraPositionAgent() const;
     LLVector3d      calcCameraPositionTargetGlobal(bool *hit_limit = NULL); // Calculate the camera position target
     F32             getCameraMinOffGround();        // Minimum height off ground for this mode, meters
     void            setCameraCollidePlane(const LLVector4 &plane) { mCameraCollidePlane = plane; }
     bool            calcCameraMinDistance(F32 &obj_min_distance);
-    F32             getCurrentCameraBuildOffset()   { return (F32)mCameraFocusOffset.length(); }
+    F32             getCurrentCameraBuildOffset() const { return (F32)mCameraFocusOffset.length(); }
     void            clearCameraLag() { mCameraLag.clearVec(); }
+    const LLVector3& getCameraUpVector() const { return mCameraUpVector; }
 private:
     LLVector3       getAvatarRootPosition();
 
@@ -154,7 +156,6 @@ private:
     F32             mCameraCurrentFOVZoomFactor;    // Interpolated fov zoom
     LLVector4       mCameraCollidePlane;            // Colliding plane for camera
     F32             mCameraZoomFraction;            // Mousewheel driven fraction of zoom
-    LLVector3       mCameraPositionAgent;           // Camera position in agent coordinates
     LLVector3       mCameraVirtualPositionAgent;    // Camera virtual position (target) before performing FOV zoom
     LLVector3d      mCameraSmoothingLastPositionGlobal;
     LLVector3d      mCameraSmoothingLastPositionAgent;
@@ -278,7 +279,7 @@ public:
     F32             getAgentHUDTargetZoom();
 
     void            resetCameraZoomFraction();
-    F32             getCurrentCameraZoomFraction() { return mCameraZoomFraction; }
+    F32             getCurrentCameraZoomFraction() const { return mCameraZoomFraction; }
 
     //--------------------------------------------------------------------
     // Pan
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index 0b5198bbd3..8b18b7d5a2 100644
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -322,9 +322,7 @@ void LLAgentPilot::moveCamera()
 
         LLViewerCamera::getInstance()->setView(view);
         LLViewerCamera::getInstance()->setOrigin(origin);
-        LLViewerCamera::getInstance()->mXAxis = LLVector3(mat.mMatrix[0]);
-        LLViewerCamera::getInstance()->mYAxis = LLVector3(mat.mMatrix[1]);
-        LLViewerCamera::getInstance()->mZAxis = LLVector3(mat.mMatrix[2]);
+        LLViewerCamera::getInstance()->setAxes(mat);
     }
 }
 
diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp
index 11c5ffecb6..5114ac8a08 100644
--- a/indra/newview/llaisapi.cpp
+++ b/indra/newview/llaisapi.cpp
@@ -839,7 +839,7 @@ void AISAPI::onUpdateReceived(const LLSD& update, COMMAND_TYPE type, const LLSD&
     if ( (type == UPDATECATEGORY || type == UPDATEITEM)
         && gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
     {
-        dump_sequential_xml(gAgentAvatarp->getFullname() + "_ais_update", update);
+        dump_sequential_xml(gAgentAvatarp->getDebugName() + "_ais_update", update);
     }
 
     AISUpdate ais_update(update, type, request_body);
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 101aca3823..5748d52ab7 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2042,7 +2042,7 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id)
 }
 
 // Moved from LLWearableList::ContextMenu for wider utility.
-bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids) const
+bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids, bool warn_on_type_mismatch) const
 {
     // TODO: investigate wearables may not be loaded at this point EXT-8231
 
@@ -2072,7 +2072,10 @@ bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids) const
         }
         else
         {
+            if (warn_on_type_mismatch)
+            {
             LL_WARNS() << "Unexpected wearable type" << LL_ENDL;
+            }
             return false;
         }
     }
@@ -2263,7 +2266,7 @@ void LLAppearanceMgr::updateCOF(const LLUUID& category, bool append)
     }
     if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
     {
-        dump_sequential_xml(gAgentAvatarp->getFullname() + "_slam_request", contents);
+        dump_sequential_xml(gAgentAvatarp->getDebugName() + "_slam_request", contents);
     }
     slam_inventory_folder(getCOF(), contents, link_waiter);
 
@@ -3956,7 +3959,7 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAd
         LL_DEBUGS("Avatar") << "succeeded" << LL_ENDL;
         if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
         {
-            dump_sequential_xml(gAgentAvatarp->getFullname() + "_appearance_request_ok", result);
+            dump_sequential_xml(gAgentAvatarp->getDebugName() + "_appearance_request_ok", result);
         }
 
     } while (bRetry);
@@ -3965,7 +3968,7 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAd
 /*static*/
 void LLAppearanceMgr::debugAppearanceUpdateCOF(const LLSD& content)
 {
-    dump_sequential_xml(gAgentAvatarp->getFullname() + "_appearance_request_error", content);
+    dump_sequential_xml(gAgentAvatarp->getDebugName() + "_appearance_request_error", content);
 
     LL_INFOS("Avatar") << "AIS COF, version received: " << content["expected"].asInteger()
         << " ================================= " << LL_ENDL;
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 6c45a32856..a6ee62137b 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -102,7 +102,7 @@ public:
     bool getCanReplaceCOF(const LLUUID& outfit_cat_id);
 
     // Can we add all referenced items to the avatar?
-    bool canAddWearables(const uuid_vec_t& item_ids) const;
+    bool canAddWearables(const uuid_vec_t& item_ids, bool warn_on_type_mismatch = true) const;
 
     // Copy all items in a category.
     void shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id,
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c5190fe486..8fdc7f692e 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -453,13 +453,28 @@ static bool app_metrics_qa_mode = false;
 
 void idle_afk_check()
 {
+    // Don't check AFK status during startup states
+    if (LLStartUp::getStartupState() < STATE_STARTED)
+    {
+        return;
+    }
+
     // check idle timers
     F32 current_idle = gAwayTriggerTimer.getElapsedTimeF32();
     static LLCachedControl<S32> afk_timeout(gSavedSettings, "AFKTimeout", 300);
-    if (afk_timeout() && (current_idle > (F32)afk_timeout()) && !gAgent.getAFK())
+    if (afk_timeout() && (current_idle > afk_timeout()))
     {
-        LL_INFOS("IdleAway") << "Idle more than " << afk_timeout << " seconds: automatically changing to Away status" << LL_ENDL;
-        gAgent.setAFK();
+        if (!gAgent.getAFK())
+        {
+            LL_INFOS("IdleAway") << "Idle more than " << afk_timeout << " seconds: automatically changing to Away status" << LL_ENDL;
+            gAgent.setAFK();
+        }
+        else
+        {
+            // Refresh timer so that random one click or hover won't clear the status.
+            // But expanding the window still should lift afk status
+            gAwayTimer.reset();
+        }
     }
 }
 
@@ -1878,36 +1893,6 @@ bool LLAppViewer::cleanup()
     // Clean up before GL is shut down because we might be holding on to objects with texture references
     LLSelectMgr::cleanupGlobals();
 
-    LL_INFOS() << "Shutting down OpenGL" << LL_ENDL;
-
-    // Shut down OpenGL
-    if( gViewerWindow)
-    {
-        gViewerWindow->shutdownGL();
-
-        // Destroy window, and make sure we're not fullscreen
-        // This may generate window reshape and activation events.
-        // Therefore must do this before destroying the message system.
-        delete gViewerWindow;
-        gViewerWindow = NULL;
-        LL_INFOS() << "ViewerWindow deleted" << LL_ENDL;
-    }
-
-    LLSplashScreen::show();
-    LLSplashScreen::update(LLTrans::getString("ShuttingDown"));
-
-    LL_INFOS() << "Cleaning up Keyboard & Joystick" << LL_ENDL;
-
-    // viewer UI relies on keyboard so keep it aound until viewer UI isa gone
-    delete gKeyboard;
-    gKeyboard = NULL;
-
-    if (LLViewerJoystick::instanceExists())
-    {
-        // Turn off Space Navigator and similar devices
-        LLViewerJoystick::getInstance()->terminate();
-    }
-
     LL_INFOS() << "Cleaning up Objects" << LL_ENDL;
 
     LLViewerObject::cleanupVOClasses();
@@ -2068,6 +2053,36 @@ bool LLAppViewer::cleanup()
     sTextureFetch->shutDownTextureCacheThread() ;
     LLLFSThread::sLocal->shutdown();
 
+    LL_INFOS() << "Shutting down OpenGL" << LL_ENDL;
+
+    // Shut down OpenGL
+    if (gViewerWindow)
+    {
+        gViewerWindow->shutdownGL();
+
+        // Destroy window, and make sure we're not fullscreen
+        // This may generate window reshape and activation events.
+        // Therefore must do this before destroying the message system.
+        delete gViewerWindow;
+        gViewerWindow = NULL;
+        LL_INFOS() << "ViewerWindow deleted" << LL_ENDL;
+    }
+
+    LLSplashScreen::show();
+    LLSplashScreen::update(LLTrans::getString("ShuttingDown"));
+
+    LL_INFOS() << "Cleaning up Keyboard & Joystick" << LL_ENDL;
+
+    // viewer UI relies on keyboard so keep it aound until viewer UI isa gone
+    delete gKeyboard;
+    gKeyboard = NULL;
+
+    if (LLViewerJoystick::instanceExists())
+    {
+        // Turn off Space Navigator and similar devices
+        LLViewerJoystick::getInstance()->terminate();
+    }
+
     LL_INFOS() << "Shutting down message system" << LL_ENDL;
     end_messaging_system();
 
diff --git a/indra/newview/llautoreplace.cpp b/indra/newview/llautoreplace.cpp
index f200ca8e31..1ea2899ba4 100644
--- a/indra/newview/llautoreplace.cpp
+++ b/indra/newview/llautoreplace.cpp
@@ -536,11 +536,12 @@ LLAutoReplaceSettings::AddListResult LLAutoReplaceSettings::replaceList(const LL
         S32 search_index;
         LLSD targetList;
         // The following is working around the fact that LLSD arrays containing maps also seem to have undefined entries... see LLSD-30
-        for ( search_index = 0, targetList = mLists[0];
+        for ( search_index = 0;
               !listFound && search_index < mLists.size();
-              search_index += 1, targetList = mLists[search_index]
+              search_index += 1
              )
         {
+            targetList = mLists[search_index];
             if ( targetList.isMap() )
             {
                 if ( listNameMatches( targetList, listName) )
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 9201241856..660fb1b41a 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -129,14 +129,14 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
         {
             LLVector3 pos_box_offset = point_to_box_offset(vol_pos, unshift_extents);
             F32 offset_dist = pos_box_offset.length();
-            if (offset_dist > MAX_LEGAL_OFFSET && offset_dist > 0.f)
+            if (offset_dist > max_legal_offset && offset_dist > 0.f)
             {
-                F32 target_dist = (offset_dist - MAX_LEGAL_OFFSET);
+                F32 target_dist = (offset_dist - max_legal_offset);
                 new_pos_fixup = (target_dist/offset_dist)*pos_box_offset;
             }
             if (new_pos_fixup != mPositionConstraintFixup)
             {
-                LL_DEBUGS("ConstraintFix") << getFullname() << " pos fix, offset_dist " << offset_dist << " pos fixup "
+                LL_DEBUGS("ConstraintFix") << getDebugName() << " pos fix, offset_dist " << offset_dist << " pos fixup "
                                            << new_pos_fixup << " was " << mPositionConstraintFixup << LL_ENDL;
                 LL_DEBUGS("ConstraintFix") << "vol_pos " << vol_pos << LL_ENDL;
                 LL_DEBUGS("ConstraintFix") << "extents " << extents[0] << " " << extents[1] << LL_ENDL;
@@ -144,11 +144,11 @@ void LLControlAvatar::getNewConstraintFixups(LLVector3& new_pos_fixup, F32& new_
 
             }
         }
-        if (box_size/mScaleConstraintFixup > MAX_LEGAL_SIZE)
+        if (box_size/mScaleConstraintFixup > max_legal_size)
         {
-            new_scale_fixup = mScaleConstraintFixup* MAX_LEGAL_SIZE /box_size;
-            LL_DEBUGS("ConstraintFix") << getFullname() << " scale fix, box_size " << box_size << " fixup "
-                                       << mScaleConstraintFixup << " max legal " << MAX_LEGAL_SIZE
+            new_scale_fixup = mScaleConstraintFixup*max_legal_size/box_size;
+            LL_DEBUGS("ConstraintFix") << getDebugName() << " scale fix, box_size " << box_size << " fixup "
+                                       << mScaleConstraintFixup << " max legal " << max_legal_size
                                        << " -> new scale " << new_scale_fixup << LL_ENDL;
         }
     }
@@ -231,7 +231,7 @@ void LLControlAvatar::matchVolumeTransform()
             const LLMeshSkinInfo* skin_info = mRootVolp->getSkinInfo();
             if (skin_info)
             {
-                LL_DEBUGS("BindShape") << getFullname() << " bind shape " << skin_info->mBindShapeMatrix << LL_ENDL;
+                LL_DEBUGS("BindShape") << getDebugName() << " bind shape " << skin_info->mBindShapeMatrix << LL_ENDL;
                 bind_rot = LLSkinningUtil::getUnscaledQuaternion(LLMatrix4(skin_info->mBindShapeMatrix));
             }
 #endif
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index e6a720e734..cea68c1779 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -663,7 +663,7 @@ void LLConversationLog::onClearLogResponse(const LLSD& notification, const LLSD&
     {
         mConversations.clear();
         notifyObservers();
-        cache();
+        saveToFile(getFileName());
         deleteBackupLogs();
     }
 }
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index c1e48c63a9..d5486b9f4a 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -79,6 +79,9 @@ public:
     virtual LLPointer<LLUIImage> getOpenIcon() const { return getIcon(); }
     virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; }
     virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
+    virtual bool isFavorite() const { return false; }
+    virtual bool isAgentInventory() const { return false; }
+    virtual bool isAgentInventoryRoot() const { return false; }
     virtual bool isItemRenameable() const { return true; }
     virtual bool renameItem(const std::string& new_name) { mName = new_name; mNeedsRefresh = true; return true; }
     virtual bool isItemMovable( void ) const { return false; }
diff --git a/indra/newview/llfloaterautoreplacesettings.cpp b/indra/newview/llfloaterautoreplacesettings.cpp
index 99f24e161e..d93bd624f5 100644
--- a/indra/newview/llfloaterautoreplacesettings.cpp
+++ b/indra/newview/llfloaterautoreplacesettings.cpp
@@ -422,7 +422,13 @@ bool LLFloaterAutoReplaceSettings::callbackNewListName(const LLSD& notification,
 
     LLSD newList = notification["payload"]["list"];
 
-    if ( response.has("listname") && response["listname"].isString() )
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (option != 1) // Must also match RenameAutoReplaceList
+    {
+        // user cancelled
+        return false;
+    }
+    else if (response.has("listname") && response["listname"].isString() )
     {
         std::string newName = response["listname"].asString();
         LLAutoReplaceSettings::setListName(newList, newName);
@@ -508,12 +514,53 @@ bool LLFloaterAutoReplaceSettings::callbackListNameConflict(const LLSD& notifica
     return false;
 }
 
+bool LLFloaterAutoReplaceSettings::callbackRemoveList(const LLSD& notification, const LLSD& response)
+{
+    std::string listName = notification["payload"]["list"];
+
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    switch (option)
+    {
+    case 1:
+        if (mSettings.removeReplacementList(listName))
+        {
+            LL_INFOS("AutoReplace") << "deleted list '" << listName << "'" << LL_ENDL;
+            mReplacementsList->deleteSelectedItems();   // remove from the scrolling list
+            mSelectedListName.clear();
+            updateListNames();
+            updateListNamesControls();
+            updateReplacementsList();
+        }
+        break;
+    case 0:
+        break;
+
+    default:
+        LL_ERRS("AutoReplace") << "invalid selected option " << option << LL_ENDL;
+    }
+
+    return false;
+}
+
 void LLFloaterAutoReplaceSettings::onDeleteList()
 {
     std::string listName = mListNames->getSelectedValue().asString();
     if ( ! listName.empty() )
     {
-        if ( mSettings.removeReplacementList(listName) )
+        const LLSD* mappings = mSettings.getListEntries(mSelectedListName);
+        if (mappings->size() > 0)
+        {
+            LLSD payload;
+            payload["list"] = listName;
+
+            LLSD args;
+            args["MAP_SIZE"] = llformat("%d",mappings->size());
+            args["LIST_NAME"] = listName;
+
+            LLNotificationsUtil::add("RemoveAutoReplaceList", args, payload,
+                boost::bind(&LLFloaterAutoReplaceSettings::callbackRemoveList, this, _1, _2));
+        }
+        else if ( mSettings.removeReplacementList(listName) )
         {
             LL_INFOS("AutoReplace")<<"deleted list '"<<listName<<"'"<<LL_ENDL;
             mReplacementsList->deleteSelectedItems();   // remove from the scrolling list
diff --git a/indra/newview/llfloaterautoreplacesettings.h b/indra/newview/llfloaterautoreplacesettings.h
index 94a7c00c15..1a8068ab7c 100644
--- a/indra/newview/llfloaterautoreplacesettings.h
+++ b/indra/newview/llfloaterautoreplacesettings.h
@@ -105,6 +105,8 @@ private:
     bool callbackNewListName(const LLSD& notification, const LLSD& response);
     /// called from the RenameAutoReplaceList notification dialog
     bool callbackListNameConflict(const LLSD& notification, const LLSD& response);
+    /// called from the RemoveAutoReplaceList notification dialog
+    bool callbackRemoveList(const LLSD& notification, const LLSD& response);
 
     bool selectedListIsFirst();
     bool selectedListIsLast();
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
index b94c31ec04..7450be45f1 100644
--- a/indra/newview/llfloaterbvhpreview.cpp
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -118,8 +118,8 @@ std::string STATUS[] =
 //-----------------------------------------------------------------------------
 // LLFloaterBvhPreview()
 //-----------------------------------------------------------------------------
-LLFloaterBvhPreview::LLFloaterBvhPreview(const std::string& filename) :
-    LLFloaterNameDesc(filename)
+LLFloaterBvhPreview::LLFloaterBvhPreview(const LLSD& args) :
+    LLFloaterNameDesc(args)
 {
     mLastMouseX = 0;
     mLastMouseY = 0;
@@ -1028,7 +1028,8 @@ void LLFloaterBvhPreview::onBtnOK(void* userdata)
                     LLFloaterPerms::getNextOwnerPerms("Uploads"),
                     LLFloaterPerms::getGroupPerms("Uploads"),
                     LLFloaterPerms::getEveryonePerms("Uploads"),
-                    expected_upload_cost));
+                    expected_upload_cost,
+                    floaterp->mDestinationFolderId));
 
                 upload_new_resource(assetUploadInfo);
             }
diff --git a/indra/newview/llfloaterbvhpreview.h b/indra/newview/llfloaterbvhpreview.h
index ae64521492..c6b75c00b2 100644
--- a/indra/newview/llfloaterbvhpreview.h
+++ b/indra/newview/llfloaterbvhpreview.h
@@ -70,7 +70,7 @@ protected:
 class LLFloaterBvhPreview : public LLFloaterNameDesc
 {
 public:
-    LLFloaterBvhPreview(const std::string& filename);
+    LLFloaterBvhPreview(const LLSD& args);
     virtual ~LLFloaterBvhPreview();
 
     bool postBuild();
diff --git a/indra/newview/llfloatereditenvironmentbase.h b/indra/newview/llfloatereditenvironmentbase.h
index 37fda5d33e..41192f3d30 100644
--- a/indra/newview/llfloatereditenvironmentbase.h
+++ b/indra/newview/llfloatereditenvironmentbase.h
@@ -133,7 +133,8 @@ protected:
     LLSettingsEditPanel() :
         LLPanel(),
         mIsDirty(false),
-        mOnDirtyChanged()
+        mOnDirtyChanged(),
+        mCanEdit(false)
     {}
 
 private:
diff --git a/indra/newview/llfloaterenvironmentadjust.cpp b/indra/newview/llfloaterenvironmentadjust.cpp
index 35f8340997..58616995d3 100644
--- a/indra/newview/llfloaterenvironmentadjust.cpp
+++ b/indra/newview/llfloaterenvironmentadjust.cpp
@@ -455,9 +455,29 @@ void LLFloaterEnvironmentAdjust::onMoonAzimElevChanged()
 void LLFloaterEnvironmentAdjust::onCloudMapChanged()
 {
     if (!mLiveSky)
+    {
         return;
-    mLiveSky->setCloudNoiseTextureId(getChild<LLTextureCtrl>(FIELD_SKY_CLOUD_MAP)->getValue().asUUID());
-    mLiveSky->update();
+    }
+
+    LLTextureCtrl* picker_ctrl = getChild<LLTextureCtrl>(FIELD_SKY_CLOUD_MAP);
+
+    LLUUID new_texture_id = picker_ctrl->getValue().asUUID();
+
+    LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
+
+    LLSettingsSky::ptr_t sky_to_set = mLiveSky->buildClone();
+    if (!sky_to_set)
+    {
+        return;
+    }
+
+    sky_to_set->setCloudNoiseTextureId(new_texture_id);
+
+    LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, sky_to_set);
+
+    LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT, true);
+
+    picker_ctrl->setValue(new_texture_id);
 }
 
 void LLFloaterEnvironmentAdjust::onWaterMapChanged()
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 989e1d8d04..f254fdafaf 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -72,8 +72,8 @@ const S32 PREVIEW_TEXTURE_HEIGHT = 320;
 //-----------------------------------------------------------------------------
 // LLFloaterImagePreview()
 //-----------------------------------------------------------------------------
-LLFloaterImagePreview::LLFloaterImagePreview(const std::string& filename) :
-    LLFloaterNameDesc(filename),
+LLFloaterImagePreview::LLFloaterImagePreview(const LLSD& args) :
+    LLFloaterNameDesc(args),
 
     mAvatarPreview(NULL),
     mSculptedPreview(NULL),
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h
index ed395722de..9bc57246cf 100644
--- a/indra/newview/llfloaterimagepreview.h
+++ b/indra/newview/llfloaterimagepreview.h
@@ -110,7 +110,7 @@ protected:
 class LLFloaterImagePreview : public LLFloaterNameDesc
 {
 public:
-    LLFloaterImagePreview(const std::string& filename);
+    LLFloaterImagePreview(const LLSD& args);
     virtual ~LLFloaterImagePreview();
 
     bool postBuild() override;
diff --git a/indra/newview/llfloaterinventorysettings.cpp b/indra/newview/llfloaterinventorysettings.cpp
index e5ee69f240..aab632bcb8 100644
--- a/indra/newview/llfloaterinventorysettings.cpp
+++ b/indra/newview/llfloaterinventorysettings.cpp
@@ -28,9 +28,14 @@
 
 #include "llfloaterinventorysettings.h"
 
+#include "llcolorswatch.h"
+#include "llviewercontrol.h"
+
 LLFloaterInventorySettings::LLFloaterInventorySettings(const LLSD& key)
   : LLFloater(key)
 {
+    mCommitCallbackRegistrar.add("ScriptPref.applyUIColor", boost::bind(&LLFloaterInventorySettings::applyUIColor, this, _1, _2));
+    mCommitCallbackRegistrar.add("ScriptPref.getUIColor", boost::bind(&LLFloaterInventorySettings::getUIColor, this, _1, _2));
 }
 
 LLFloaterInventorySettings::~LLFloaterInventorySettings()
@@ -39,6 +44,29 @@ LLFloaterInventorySettings::~LLFloaterInventorySettings()
 bool LLFloaterInventorySettings::postBuild()
 {
     getChild<LLButton>("ok_btn")->setCommitCallback(boost::bind(&LLFloater::closeFloater, this, false));
+
+    getChild<LLUICtrl>("favorites_color")->setCommitCallback(boost::bind(&LLFloaterInventorySettings::updateColorSwatch, this));
+
+    bool enable_color = gSavedSettings.getBOOL("InventoryFavoritesColorText");
+    getChild<LLUICtrl>("favorites_swatch")->setEnabled(enable_color);
+
     return true;
 }
 
+void LLFloaterInventorySettings::updateColorSwatch()
+{
+    bool val = getChild<LLUICtrl>("favorites_color")->getValue();
+    getChild<LLUICtrl>("favorites_swatch")->setEnabled(val);
+}
+
+void LLFloaterInventorySettings::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
+{
+    LLUIColorTable::instance().setColor(param.asString(), LLColor4(ctrl->getValue()));
+}
+
+void LLFloaterInventorySettings::getUIColor(LLUICtrl* ctrl, const LLSD& param)
+{
+    LLColorSwatchCtrl* color_swatch = (LLColorSwatchCtrl*)ctrl;
+    color_swatch->setOriginal(LLUIColorTable::instance().getColor(param.asString()));
+}
+
diff --git a/indra/newview/llfloaterinventorysettings.h b/indra/newview/llfloaterinventorysettings.h
index 3fe3a001b9..c27d5d2e1b 100644
--- a/indra/newview/llfloaterinventorysettings.h
+++ b/indra/newview/llfloaterinventorysettings.h
@@ -40,6 +40,11 @@ public:
 private:
     LLFloaterInventorySettings(const LLSD& key);
     ~LLFloaterInventorySettings();
+
+    void updateColorSwatch();
+
+    void applyUIColor(LLUICtrl* ctrl, const LLSD& param);
+    void getUIColor(LLUICtrl* ctrl, const LLSD& param);
 };
 
 #endif
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 8332a430e6..b5489d2dd8 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -349,14 +349,14 @@ void LLFloaterModelPreview::initModelPreview()
 }
 
 //static
-bool LLFloaterModelPreview::showModelPreview()
+void LLFloaterModelPreview::showModelPreview(const LLUUID& dest_folder)
 {
     LLFloaterModelPreview* fmp = (LLFloaterModelPreview*)LLFloaterReg::getInstance("upload_model");
     if (fmp && !fmp->isModelLoading())
     {
+        fmp->setUploadDestination(dest_folder);
         fmp->loadHighLodModel();
     }
-    return true;
 }
 
 void LLFloaterModelPreview::onUploadOptionChecked(LLUICtrl* ctrl)
@@ -505,7 +505,7 @@ void LLFloaterModelPreview::onClickCalculateBtn()
     gMeshRepo.uploadModel(mModelPreview->mUploadData, mModelPreview->mPreviewScale,
                           childGetValue("upload_textures").asBoolean(),
                           upload_skinweights, upload_joint_positions, lock_scale_if_joint_position,
-                          mUploadModelUrl, false,
+                          mUploadModelUrl, mDestinationFolderId, false,
                           getWholeModelFeeObserverHandle());
 
     toggleCalculateButton(false);
@@ -1660,7 +1660,7 @@ void LLFloaterModelPreview::onUpload(void* user_data)
     gMeshRepo.uploadModel(mp->mModelPreview->mUploadData, mp->mModelPreview->mPreviewScale,
                           mp->childGetValue("upload_textures").asBoolean(),
                           upload_skinweights, upload_joint_positions, lock_scale_if_joint_position,
-                          mp->mUploadModelUrl,
+                          mp->mUploadModelUrl, mp->mDestinationFolderId,
                           true, LLHandle<LLWholeModelFeeObserver>(), mp->getWholeModelUploadObserverHandle());
 }
 
@@ -1770,9 +1770,15 @@ void LLFloaterModelPreview::onLoDSourceCommit(S32 lod)
     if (index == LLModelPreview::MESH_OPTIMIZER_AUTO
         || index == LLModelPreview::MESH_OPTIMIZER_SLOPPY
         || index == LLModelPreview::MESH_OPTIMIZER_PRECISE)
-    { //rebuild LoD to update triangle counts
+    {
+        // rebuild LoD to update triangle counts
         onLODParamCommit(lod, true);
     }
+    if (index == LLModelPreview::USE_LOD_ABOVE)
+    {
+        // refresh to pick triangle counts
+        mModelPreview->mDirty = true;
+    }
 }
 
 void LLFloaterModelPreview::resetDisplayOptions()
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 6adc084fe8..7b652a3613 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -73,7 +73,8 @@ public:
     /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true);
 
     void initModelPreview();
-    static bool showModelPreview();
+    void setUploadDestination(const LLUUID& dest_folder) { mDestinationFolderId = dest_folder; }
+    static void showModelPreview(const LLUUID& dest_folder = LLUUID::null);
 
     bool handleMouseDown(S32 x, S32 y, MASK mask);
     bool handleMouseUp(S32 x, S32 y, MASK mask);
@@ -164,9 +165,6 @@ protected:
 
     static void onPhysicsBrowse(LLUICtrl* ctrl, void* userdata);
     static void onPhysicsUseLOD(LLUICtrl* ctrl, void* userdata);
-    static void onPhysicsOptimize(LLUICtrl* ctrl, void* userdata);
-    static void onPhysicsDecomposeBack(LLUICtrl* ctrl, void* userdata);
-    static void onPhysicsSimplifyBack(LLUICtrl* ctrl, void* userdata);
 
     void            draw();
 
@@ -225,6 +223,7 @@ private:
 
     void createSmoothComboBox(LLComboBox* combo_box, float min, float max);
 
+    LLUUID mDestinationFolderId;
     LLButton* mUploadBtn;
     LLButton* mCalculateBtn;
     LLViewerTextEditor* mUploadLogText;
diff --git a/indra/newview/llfloatermyenvironment.cpp b/indra/newview/llfloatermyenvironment.cpp
index 891e16a8ef..c0405c106e 100644
--- a/indra/newview/llfloatermyenvironment.cpp
+++ b/indra/newview/llfloatermyenvironment.cpp
@@ -38,7 +38,9 @@
 #include "llcheckboxctrl.h"
 #include "llviewerinventory.h"
 #include "llenvironment.h"
+#include "llnotificationsutil.h"
 #include "llparcel.h"
+#include "lltrans.h"
 #include "llviewerparcelmgr.h"
 
 //=========================================================================
@@ -223,16 +225,13 @@ void LLFloaterMyEnvironment::onFilterEdit(const std::string& search_string)
     mInventoryList->setFilterSubString(search_string);
 }
 
-void LLFloaterMyEnvironment::onDeleteSelected()
+void LLFloaterMyEnvironment::onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response, uuid_vec_t item_ids)
+{
+    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+    if (option == 0)
 {
-    uuid_vec_t selected;
-
-    getSelectedIds(selected);
-    if (selected.empty())
-        return;
-
     const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-    for (const LLUUID& itemid: selected)
+        for (const LLUUID& itemid : item_ids)
     {
         LLInventoryItem* inv_item = gInventory.getItem(itemid);
 
@@ -253,6 +252,27 @@ void LLFloaterMyEnvironment::onDeleteSelected()
     }
     gInventory.notifyObservers();
 }
+}
+
+void LLFloaterMyEnvironment::onDeleteSelected()
+{
+    uuid_vec_t selected;
+
+    getSelectedIds(selected);
+    if (selected.empty())
+        return;
+
+    LLSD args;
+    args["QUESTION"] = LLTrans::getString(selected.size() > 1 ? "DeleteItems" : "DeleteItem");
+    LLNotificationsUtil::add(
+        "DeleteItems",
+        args,
+        LLSD(),
+        [this, selected](const LLSD& notification, const LLSD& response)
+        {
+            onItemsRemovalConfirmation(notification, response, selected);
+        });
+}
 
 
 void LLFloaterMyEnvironment::onDoCreate(const LLSD &data)
@@ -318,13 +338,13 @@ bool LLFloaterMyEnvironment::canAction(const std::string &context)
 
     if (context == PARAMETER_EDIT)
     {
-        return (selected.size() == 1) && isSettingSelected(selected.front());
+        return (selected.size() == 1) && isSettingId(selected.front());
     }
     else if (context == PARAMETER_COPY)
     {
         for (std::vector<LLUUID>::iterator it = selected.begin(); it != selected.end(); it++)
         {
-            if(!isSettingSelected(*it))
+            if(!isSettingId(*it))
             {
                 return false;
             }
@@ -342,7 +362,7 @@ bool LLFloaterMyEnvironment::canAction(const std::string &context)
         LLClipboard::instance().pasteFromClipboard(ids);
         for (std::vector<LLUUID>::iterator it = ids.begin(); it != ids.end(); it++)
         {
-            if (!isSettingSelected(*it))
+            if (!isSettingId(*it))
             {
                 return false;
             }
@@ -351,7 +371,7 @@ bool LLFloaterMyEnvironment::canAction(const std::string &context)
     }
     else if (context == PARAMETER_COPYUUID)
     {
-        return (selected.size() == 1) && isSettingSelected(selected.front());
+        return (selected.size() == 1) && isSettingId(selected.front());
     }
 
     return false;
@@ -367,16 +387,42 @@ bool LLFloaterMyEnvironment::canApply(const std::string &context)
 
     if (context == PARAMETER_REGION)
     {
-        return LLEnvironment::instance().canAgentUpdateRegionEnvironment();
+        return isSettingId(selected.front()) && LLEnvironment::instance().canAgentUpdateRegionEnvironment();
     }
     else if (context == PARAMETER_PARCEL)
     {
-        return LLEnvironment::instance().canAgentUpdateParcelEnvironment();
+        return isSettingId(selected.front()) && LLEnvironment::instance().canAgentUpdateParcelEnvironment();
     }
-    else
+    else if (context == PARAMETER_LOCAL)
     {
-        return (context == PARAMETER_LOCAL);
+        return isSettingId(selected.front());
     }
+
+    return false;
+}
+
+bool can_delete(const LLUUID& id)
+{
+    const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+    if (id == trash_id || gInventory.isObjectDescendentOf(id, trash_id))
+    {
+        return false;
+    }
+
+    LLViewerInventoryCategory* cat = gInventory.getCategory(id);
+    if (cat)
+    {
+        if (!get_is_category_removable(&gInventory, id))
+        {
+            return false;
+        }
+    }
+    else if (!get_is_item_removable(&gInventory, id, false))
+    {
+        return false;
+    }
+
+    return true;
 }
 
 //-------------------------------------------------------------------------
@@ -389,7 +435,14 @@ void LLFloaterMyEnvironment::refreshButtonStates()
 
     getChild<LLUICtrl>(BUTTON_GEAR)->setEnabled(settings_ok);
     getChild<LLUICtrl>(BUTTON_NEWSETTINGS)->setEnabled(true);
-    getChild<LLUICtrl>(BUTTON_DELETE)->setEnabled(settings_ok && !selected.empty());
+
+    bool enable_delete = false;
+    if(settings_ok && !selected.empty())
+    {
+        enable_delete = can_delete(selected.front());
+    }
+
+    getChild<LLUICtrl>(BUTTON_DELETE)->setEnabled(enable_delete);
 }
 
 //-------------------------------------------------------------------------
@@ -438,7 +491,7 @@ LLUUID LLFloaterMyEnvironment::findItemByAssetId(LLUUID asset_id, bool copyable_
     return LLUUID::null;
 }
 
-bool LLFloaterMyEnvironment::isSettingSelected(LLUUID item_id)
+bool LLFloaterMyEnvironment::isSettingId(const LLUUID& item_id)
 {
     LLInventoryItem* itemp = gInventory.getItem(item_id);
 
diff --git a/indra/newview/llfloatermyenvironment.h b/indra/newview/llfloatermyenvironment.h
index 8e81b8e5e2..c5d521d207 100644
--- a/indra/newview/llfloatermyenvironment.h
+++ b/indra/newview/llfloatermyenvironment.h
@@ -60,6 +60,7 @@ private:
     void                            onFilterCheckChange();
     void                            onFilterEdit(const std::string& search_string);
     void                            onSelectionChange();
+    void                            onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response, uuid_vec_t item_ids);
     void                            onDeleteSelected();
     void                            onDoCreate(const LLSD &data);
     void                            onDoApply(const std::string &context);
@@ -69,7 +70,7 @@ private:
     void                            getSelectedIds(uuid_vec_t& ids) const;
     void                            refreshButtonStates();
 
-    bool                            isSettingSelected(LLUUID item_id);
+    static bool                     isSettingId(const LLUUID &item_id);
 
     static LLUUID                   findItemByAssetId(LLUUID asset_id, bool copyable_only, bool ignore_library);
 };
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
index 01c50d89c5..569b41cfa9 100644
--- a/indra/newview/llfloaternamedesc.cpp
+++ b/indra/newview/llfloaternamedesc.cpp
@@ -62,11 +62,20 @@ const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
 //-----------------------------------------------------------------------------
 // LLFloaterNameDesc()
 //-----------------------------------------------------------------------------
-LLFloaterNameDesc::LLFloaterNameDesc(const LLSD& filename )
-    : LLFloater(filename),
-      mIsAudio(false)
+LLFloaterNameDesc::LLFloaterNameDesc(const LLSD& args)
+    : LLFloater(args)
+    , mIsAudio(false)
+    , mIsText(false)
 {
-    mFilenameAndPath = filename.asString();
+    if (args.isString())
+    {
+        mFilenameAndPath = args.asString();
+    }
+    else
+    {
+        mFilenameAndPath = args["filename"].asString();
+        mDestinationFolderId = args["dest"].asUUID();
+    }
     mFilename = gDirUtilp->getBaseFileName(mFilenameAndPath, false);
 }
 
@@ -203,7 +212,8 @@ void LLFloaterNameDesc::onBtnOK( )
             LLFloaterPerms::getNextOwnerPerms("Uploads"),
             LLFloaterPerms::getGroupPerms("Uploads"),
             LLFloaterPerms::getEveryonePerms("Uploads"),
-            expected_upload_cost));
+            expected_upload_cost,
+            mDestinationFolderId));
 
         upload_new_resource(uploadInfo, callback, nruserdata);
     }
@@ -230,8 +240,8 @@ void LLFloaterNameDesc::onBtnCancel()
 // LLFloaterSoundPreview()
 //-----------------------------------------------------------------------------
 
-LLFloaterSoundPreview::LLFloaterSoundPreview(const LLSD& filename )
-    : LLFloaterNameDesc(filename)
+LLFloaterSoundPreview::LLFloaterSoundPreview(const LLSD& args )
+    : LLFloaterNameDesc(args)
 {
     mIsAudio = true;
 }
@@ -251,8 +261,8 @@ bool LLFloaterSoundPreview::postBuild()
 // LLFloaterAnimPreview()
 //-----------------------------------------------------------------------------
 
-LLFloaterAnimPreview::LLFloaterAnimPreview(const LLSD& filename )
-    : LLFloaterNameDesc(filename)
+LLFloaterAnimPreview::LLFloaterAnimPreview(const LLSD& args )
+    : LLFloaterNameDesc(args)
 {
 }
 
@@ -270,8 +280,8 @@ bool LLFloaterAnimPreview::postBuild()
 // LLFloaterScriptPreview()
 //-----------------------------------------------------------------------------
 
-LLFloaterScriptPreview::LLFloaterScriptPreview(const LLSD& filename )
-    : LLFloaterNameDesc(filename)
+LLFloaterScriptPreview::LLFloaterScriptPreview(const LLSD& args )
+    : LLFloaterNameDesc(args)
 {
     mIsText = true;
 }
diff --git a/indra/newview/llfloaternamedesc.h b/indra/newview/llfloaternamedesc.h
index aa5571ccc0..8c8ec49a8e 100644
--- a/indra/newview/llfloaternamedesc.h
+++ b/indra/newview/llfloaternamedesc.h
@@ -39,7 +39,7 @@ class LLRadioGroup;
 class LLFloaterNameDesc : public LLFloater
 {
 public:
-    LLFloaterNameDesc(const LLSD& filename);
+    LLFloaterNameDesc(const LLSD& args);
     virtual ~LLFloaterNameDesc();
     bool postBuild() override;
 
@@ -58,6 +58,7 @@ protected:
 
     std::string     mFilenameAndPath;
     std::string     mFilename;
+    LLUUID          mDestinationFolderId;
 };
 
 class LLFloaterSoundPreview : public LLFloaterNameDesc
diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp
index 26b7304b9a..fa491a4b27 100644
--- a/indra/newview/llfloaterobjectweights.cpp
+++ b/indra/newview/llfloaterobjectweights.cpp
@@ -36,6 +36,14 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 
+static const std::string lod_strings[4] =
+{
+    "lowest_lod",
+    "low_lod",
+    "medium_lod",
+    "high_lod",
+};
+
 // virtual
 bool LLCrossParcelFunctor::apply(LLViewerObject* obj)
 {
@@ -75,7 +83,10 @@ LLFloaterObjectWeights::LLFloaterObjectWeights(const LLSD& key)
     mSelectedOnLand(NULL),
     mRezzedOnLand(NULL),
     mRemainingCapacity(NULL),
-    mTotalCapacity(NULL)
+    mTotalCapacity(NULL),
+    mLodLevel(nullptr),
+    mTrianglesShown(nullptr),
+    mPixelArea(nullptr)
 {
 }
 
@@ -99,6 +110,10 @@ bool LLFloaterObjectWeights::postBuild()
     mRemainingCapacity = getChild<LLTextBox>("remaining_capacity");
     mTotalCapacity = getChild<LLTextBox>("total_capacity");
 
+    mLodLevel = getChild<LLTextBox>("lod_level");
+    mTrianglesShown = getChild<LLTextBox>("triangles_shown");
+    mPixelArea = getChild<LLTextBox>("pixel_area");
+
     return true;
 }
 
@@ -135,6 +150,69 @@ void LLFloaterObjectWeights::setErrorStatus(S32 status, const std::string& reaso
     toggleWeightsLoadingIndicators(false);
 }
 
+void LLFloaterObjectWeights::draw()
+{
+    // Normally it's a bad idea to set text and visibility inside draw
+    // since it can cause rect updates go to different, already drawn elements,
+    // but floater is very simple and these elements are supposed to be isolated
+    LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
+    if (selection->isEmpty())
+    {
+        const std::string text = getString("nothing_selected");
+        mLodLevel->setText(text);
+        mTrianglesShown->setText(text);
+        mPixelArea->setText(text);
+
+        toggleRenderLoadingIndicators(false);
+    }
+    else
+    {
+        S32 object_lod = -1;
+        bool multiple_lods = false;
+        S32 total_tris = 0;
+        F32 pixel_area = 0;
+        for (LLObjectSelection::valid_root_iterator iter = selection->valid_root_begin();
+            iter != selection->valid_root_end(); ++iter)
+        {
+            LLViewerObject* object = (*iter)->getObject();
+            S32 lod = object->getLOD();
+            if (object_lod < 0)
+            {
+                object_lod = lod;
+            }
+            else if (object_lod != lod)
+            {
+                multiple_lods = true;
+            }
+
+            if (object->isRootEdit())
+            {
+                total_tris += object->recursiveGetTriangleCount();
+                pixel_area += object->getPixelArea();
+            }
+        }
+
+        if (multiple_lods)
+        {
+            mLodLevel->setText(getString("multiple_lods"));
+            toggleRenderLoadingIndicators(false);
+        }
+        else if (object_lod < 0)
+        {
+            // nodes are waiting for data
+            toggleRenderLoadingIndicators(true);
+        }
+        else
+        {
+            mLodLevel->setText(getString(lod_strings[object_lod]));
+            toggleRenderLoadingIndicators(false);
+        }
+        mTrianglesShown->setText(llformat("%d", total_tris));
+        mPixelArea->setText(llformat("%d", pixel_area));
+    }
+    LLFloater::draw();
+}
+
 void LLFloaterObjectWeights::updateLandImpacts(const LLParcel* parcel)
 {
     if (!parcel || LLSelectMgr::getInstance()->getSelection()->isEmpty())
@@ -252,6 +330,17 @@ void LLFloaterObjectWeights::toggleLandImpactsLoadingIndicators(bool visible)
     mTotalCapacity->setVisible(!visible);
 }
 
+void LLFloaterObjectWeights::toggleRenderLoadingIndicators(bool visible)
+{
+    childSetVisible("lod_level_loading_indicator", visible);
+    childSetVisible("triangles_shown_loading_indicator", visible);
+    childSetVisible("pixel_area_loading_indicator", visible);
+
+    mLodLevel->setVisible(!visible);
+    mTrianglesShown->setVisible(!visible);
+    mPixelArea->setVisible(!visible);
+}
+
 void LLFloaterObjectWeights::updateIfNothingSelected()
 {
     const std::string text = getString("nothing_selected");
@@ -269,6 +358,11 @@ void LLFloaterObjectWeights::updateIfNothingSelected()
     mRemainingCapacity->setText(text);
     mTotalCapacity->setText(text);
 
+    mLodLevel->setText(text);
+    mTrianglesShown->setText(text);
+    mPixelArea->setText(text);
+
     toggleWeightsLoadingIndicators(false);
     toggleLandImpactsLoadingIndicators(false);
+    toggleRenderLoadingIndicators(false);
 }
diff --git a/indra/newview/llfloaterobjectweights.h b/indra/newview/llfloaterobjectweights.h
index 3b999f6b9b..bda625564b 100644
--- a/indra/newview/llfloaterobjectweights.h
+++ b/indra/newview/llfloaterobjectweights.h
@@ -58,21 +58,24 @@ public:
     LLFloaterObjectWeights(const LLSD& key);
     ~LLFloaterObjectWeights();
 
-    /*virtual*/ bool postBuild();
+    bool postBuild() override;
 
-    /*virtual*/ void onOpen(const LLSD& key);
+    void onOpen(const LLSD& key) override;
 
-    /*virtual*/ void onWeightsUpdate(const SelectionCost& selection_cost);
-    /*virtual*/ void setErrorStatus(S32 status, const std::string& reason);
+    void onWeightsUpdate(const SelectionCost& selection_cost) override;
+    void setErrorStatus(S32 status, const std::string& reason) override;
+
+    void draw() override;
 
     void updateLandImpacts(const LLParcel* parcel);
-    void refresh();
+    void refresh() override;
 
 private:
-    /*virtual*/ void generateTransactionID();
+    void generateTransactionID() override;
 
     void toggleWeightsLoadingIndicators(bool visible);
     void toggleLandImpactsLoadingIndicators(bool visible);
+    void toggleRenderLoadingIndicators(bool visible);
 
     void updateIfNothingSelected();
 
@@ -88,6 +91,10 @@ private:
     LLTextBox       *mRezzedOnLand;
     LLTextBox       *mRemainingCapacity;
     LLTextBox       *mTotalCapacity;
+
+    LLTextBox       *mLodLevel;
+    LLTextBox       *mTrianglesShown;
+    LLTextBox       *mPixelArea;
 };
 
 #endif //LL_LLFLOATEROBJECTWEIGHTS_H
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index fdac390e8a..c881821153 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1968,7 +1968,21 @@ void LLFloaterPreference::selectChatPanel()
 
 void LLFloaterPreference::changed()
 {
+    if (LLConversationLog::instance().getIsLoggingEnabled())
+    {
     getChild<LLButton>("clear_log")->setEnabled(LLConversationLog::instance().getConversations().size() > 0);
+    }
+    else
+    {
+        // onClearLog clears list, then notifies changed() and only then clears file,
+        // so check presence of conversations before checking file, file will cleared later.
+        llstat st;
+        bool has_logs = LLConversationLog::instance().getConversations().size() > 0
+                        && LLFile::stat(LLConversationLog::instance().getFileName(), &st) == 0
+                        && S_ISREG(st.st_mode)
+                        && st.st_size > 0;
+        getChild<LLButton>("clear_log")->setEnabled(has_logs);
+    }
 
     // set 'enable' property for 'Delete transcripts...' button
     updateDeleteTranscriptsButton();
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 30ed723db6..a798ba31ee 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -486,8 +486,11 @@ void LLFloaterWorldMap::onOpen(const LLSD& key)
         const LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
         LLInventoryModelBackgroundFetch::instance().start(landmark_folder_id);
 
-        mLocationEditor->setFocus( true);
-        gFocusMgr.triggerFocusFlash();
+        if (hasFocus())
+        {
+            mLocationEditor->setFocus( true);
+            gFocusMgr.triggerFocusFlash();
+        }
 
         buildAvatarIDList();
         buildLandmarkIDLists();
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index c668d414d3..9223c13ec1 100644
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -68,9 +68,10 @@ void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder )
 
     if (!folder->areChildrenInited() || !needsSort(folder->getViewModelItem())) return;
 
-    LLFolderViewModelItemInventory* modelp =   static_cast<LLFolderViewModelItemInventory*>(folder->getViewModelItem());
-    if (modelp->getUUID().isNull()) return;
+    LLFolderViewModelItemInventory* sort_modelp =   static_cast<LLFolderViewModelItemInventory*>(folder->getViewModelItem());
+    if (sort_modelp->getUUID().isNull()) return;
 
+    bool has_favorites = false;
     for (std::list<LLFolderViewFolder*>::iterator it =   folder->getFoldersBegin(), end_it = folder->getFoldersEnd();
         it != end_it;
         ++it)
@@ -79,11 +80,14 @@ void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder )
         LLFolderViewFolder* child_folderp = *it;
         sort(child_folderp);
 
+        LLFolderViewModelItemInventory* modelp = static_cast<LLFolderViewModelItemInventory*>(child_folderp->getViewModelItem());
+        has_favorites |= child_folderp->isFavorite() || child_folderp->hasFavorites();
+
         if (child_folderp->getFoldersCount() > 0)
         {
-            time_t most_recent_folder_time =
-                static_cast<LLFolderViewModelItemInventory*>((*child_folderp->getFoldersBegin())->getViewModelItem())->getCreationDate();
-            LLFolderViewModelItemInventory* modelp =   static_cast<LLFolderViewModelItemInventory*>(child_folderp->getViewModelItem());
+            LLFolderViewModelItemInventory* folderp = static_cast<LLFolderViewModelItemInventory*>((*child_folderp->getFoldersBegin())->getViewModelItem());
+            time_t most_recent_folder_time = folderp->getCreationDate();
+
             if (most_recent_folder_time > modelp->getCreationDate())
             {
                 modelp->setCreationDate(most_recent_folder_time);
@@ -91,16 +95,26 @@ void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder )
         }
         if (child_folderp->getItemsCount() > 0)
         {
-            time_t most_recent_item_time =
-                static_cast<LLFolderViewModelItemInventory*>((*child_folderp->getItemsBegin())->getViewModelItem())->getCreationDate();
+            LLFolderViewModelItemInventory* itemp = static_cast<LLFolderViewModelItemInventory*>((*child_folderp->getItemsBegin())->getViewModelItem());
+            time_t most_recent_item_time = itemp->getCreationDate();
 
-            LLFolderViewModelItemInventory* modelp =   static_cast<LLFolderViewModelItemInventory*>(child_folderp->getViewModelItem());
             if (most_recent_item_time > modelp->getCreationDate())
             {
                 modelp->setCreationDate(most_recent_item_time);
             }
         }
     }
+    for (std::list<LLFolderViewItem*>::const_iterator it = folder->getItemsBegin(), end_it = folder->getItemsEnd();
+        it != end_it && !has_favorites;
+        ++it)
+    {
+        LLFolderViewItem* child_itemp = *it;
+        has_favorites |= child_itemp->isFavorite();
+    }
+    if (has_favorites)
+    {
+        folder->updateHasFavorites(true);
+    }
     base_t::sort(folder);
 }
 
diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h
index 48b4ee5fd9..04b0b6e8f4 100644
--- a/indra/newview/llfolderviewmodelinventory.h
+++ b/indra/newview/llfolderviewmodelinventory.h
@@ -48,6 +48,7 @@ public:
     virtual bool isItemInTrash( void) const { return false; } // TODO: make   into pure virtual.
     virtual bool isItemInOutfits() const { return false; }
     virtual bool isAgentInventory() const { return false; }
+    virtual bool isAgentInventoryRoot() const { return false; }
     virtual bool isUpToDate() const = 0;
     virtual void addChild(LLFolderViewModelItem* child);
     virtual bool hasChildren() const = 0;
diff --git a/indra/newview/llgltffolderitem.h b/indra/newview/llgltffolderitem.h
index 89d90c81cc..40a4c6fef1 100644
--- a/indra/newview/llgltffolderitem.h
+++ b/indra/newview/llgltffolderitem.h
@@ -114,6 +114,11 @@ public:
     EType getType() const { return mItemType; }
     S32 getItemId() const { return mItemId; }
 
+    bool isFavorite() const override { return false; }
+    bool isItemInTrash() const override { return false; }
+    bool isAgentInventory() const override { return false; }
+    bool isAgentInventoryRoot() const override { return false; }
+
 private:
     LLUIImagePtr pIcon;
     std::string mName;
diff --git a/indra/newview/llhudeffectresetskeleton.cpp b/indra/newview/llhudeffectresetskeleton.cpp
new file mode 100644
index 0000000000..31065a3e76
--- /dev/null
+++ b/indra/newview/llhudeffectresetskeleton.cpp
@@ -0,0 +1,211 @@
+/**
+ * @file llhudeffectresetskeleton.cpp
+ * @brief LLHUDEffectResetSkeleton class implementation
+ *
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2024, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llhudeffectresetskeleton.h"
+
+#include "llagent.h"
+#include "llviewerobjectlist.h"
+#include "llvoavatar.h"
+#include "message.h"
+
+// packet layout
+const S32 TARGET_OBJECT = 0; // This is to allow for targetting owned animesh
+const S32 RESET_ANIMATIONS = 16; //This can also be a flags if needed
+const S32 PKT_SIZE = 17;
+
+//-----------------------------------------------------------------------------
+// LLHUDEffectResetSkeleton()
+//-----------------------------------------------------------------------------
+LLHUDEffectResetSkeleton::LLHUDEffectResetSkeleton(const U8 type) :
+    LLHUDEffect(type)
+{
+}
+
+//-----------------------------------------------------------------------------
+// ~LLHUDEffectResetSkeleton()
+//-----------------------------------------------------------------------------
+LLHUDEffectResetSkeleton::~LLHUDEffectResetSkeleton()
+{
+}
+
+//-----------------------------------------------------------------------------
+// packData()
+//-----------------------------------------------------------------------------
+void LLHUDEffectResetSkeleton::packData(LLMessageSystem *mesgsys)
+{
+    // Pack the default data
+    LLHUDEffect::packData(mesgsys);
+
+    // Pack the type-specific data.  Uses a fun packed binary format.  Whee!
+    U8 packed_data[PKT_SIZE];
+    memset(packed_data, 0, PKT_SIZE);
+
+    // pack both target object and position
+    // position interpreted as offset if target object is non-null
+    if (mTargetObject)
+    {
+        htolememcpy(&(packed_data[TARGET_OBJECT]), mTargetObject->mID.mData, MVT_LLUUID, 16);
+    }
+    else
+    {
+        htolememcpy(&(packed_data[TARGET_OBJECT]), LLUUID::null.mData, MVT_LLUUID, 16);
+    }
+
+    U8 resetAnimations = (U8)mResetAnimations;
+    htolememcpy(&(packed_data[RESET_ANIMATIONS]), &resetAnimations, MVT_U8, 1);
+
+    mesgsys->addBinaryDataFast(_PREHASH_TypeData, packed_data, PKT_SIZE);
+}
+
+//-----------------------------------------------------------------------------
+// unpackData()
+//-----------------------------------------------------------------------------
+void LLHUDEffectResetSkeleton::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
+{
+    LLVector3d new_target;
+    U8 packed_data[PKT_SIZE];
+
+
+    LLHUDEffect::unpackData(mesgsys, blocknum);
+
+    LLUUID source_id;
+    mesgsys->getUUIDFast(_PREHASH_Effect, _PREHASH_AgentID, source_id, blocknum);
+
+    LLViewerObject *objp = gObjectList.findObject(source_id);
+    if (objp && objp->isAvatar())
+    {
+        setSourceObject(objp);
+    }
+    else
+    {
+        //LL_WARNS() << "Could not find source avatar for ResetSkeleton effect" << LL_ENDL;
+        return;
+    }
+
+    S32 size = mesgsys->getSizeFast(_PREHASH_Effect, blocknum, _PREHASH_TypeData);
+    if (size != PKT_SIZE)
+    {
+        LL_WARNS() << "ResetSkeleton effect with bad size " << size << LL_ENDL;
+        return;
+    }
+
+    mesgsys->getBinaryDataFast(_PREHASH_Effect, _PREHASH_TypeData, packed_data, PKT_SIZE, blocknum);
+
+    LLUUID target_id;
+    htolememcpy(target_id.mData, &(packed_data[TARGET_OBJECT]), MVT_LLUUID, 16);
+
+    // The purpose for having a target ID is if we want to reset animesh, or
+    // other things in the future.
+    // I implemented this, but due to issues regarding various permission
+    // checks, I scrapped it for now. --Chaser Zaks
+    // See https://github.com/secondlife/viewer/pull/1212 for additional info
+
+    if (target_id.isNull())
+    {
+        target_id = source_id;
+    }
+
+    objp = gObjectList.findObject(target_id);
+
+    if (objp)
+    {
+        setTargetObject(objp);
+    }
+
+    U8 resetAnimations = 0;
+    htolememcpy(&resetAnimations, &(packed_data[RESET_ANIMATIONS]), MVT_U8, 1);
+
+    // Pre-emptively assume this is going to be flags in the future.
+    // It isn't needed now, but this will assure that only bit 1 is set
+    mResetAnimations = resetAnimations & 1;
+
+    update();
+}
+
+//-----------------------------------------------------------------------------
+// setTargetObjectAndOffset()
+//-----------------------------------------------------------------------------
+void LLHUDEffectResetSkeleton::setTargetObject(LLViewerObject *objp)
+{
+    mTargetObject = objp;
+}
+
+
+//-----------------------------------------------------------------------------
+// markDead()
+//-----------------------------------------------------------------------------
+void LLHUDEffectResetSkeleton::markDead()
+{
+    LLHUDEffect::markDead();
+}
+
+void LLHUDEffectResetSkeleton::setSourceObject(LLViewerObject* objectp)
+{
+    // restrict source objects to avatars
+    if (objectp && objectp->isAvatar())
+    {
+        LLHUDEffect::setSourceObject(objectp);
+    }
+}
+
+//-----------------------------------------------------------------------------
+// update()
+//-----------------------------------------------------------------------------
+void LLHUDEffectResetSkeleton::update()
+{
+    // If the target object is dead, set the target object to NULL
+    if (mTargetObject.isNull() || mTargetObject->isDead())
+    {
+        markDead();
+        return;
+    }
+
+    if (mSourceObject.isNull() || mSourceObject->isDead())
+    {
+        markDead();
+        return;
+    }
+
+    if (mTargetObject->isAvatar())
+    {
+        // Only the owner of a avatar can reset their skeleton like this
+        // Also allow reset if we created the effect (Local resetting)
+        if (mSourceObject->getID() == mTargetObject->getID() || getOriginatedHere())
+        {
+            LLVOAvatar* avatar = mTargetObject->asAvatar();
+            avatar->resetSkeleton(mResetAnimations);
+        }
+    }
+    else
+    {
+        LL_WARNS() << mSourceObject->getID() << " attempted to reset skeleton on "
+                << mTargetObject->getID() << ", but it is not a avatar!" << LL_ENDL;
+    }
+
+    markDead();
+}
diff --git a/indra/newview/llhudeffectresetskeleton.h b/indra/newview/llhudeffectresetskeleton.h
new file mode 100644
index 0000000000..39a6137054
--- /dev/null
+++ b/indra/newview/llhudeffectresetskeleton.h
@@ -0,0 +1,59 @@
+/**
+ * @file llhudeffectresetskeleton.h
+ * @brief LLHUDEffectResetSkeleton class definition
+ *
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2024, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLHUDEFFECTRESETSKELETON_H
+#define LL_LLHUDEFFECTRESETSKELETON_H
+
+#include "llhudeffect.h"
+
+class LLViewerObject;
+class LLVOAvatar;
+
+
+class LLHUDEffectResetSkeleton final : public LLHUDEffect
+{
+public:
+    friend class LLHUDObject;
+
+    /*virtual*/ void markDead();
+    /*virtual*/ void setSourceObject(LLViewerObject* objectp);
+
+    void setTargetObject(LLViewerObject *objp);
+    void setResetAnimations(bool enable){ mResetAnimations = enable; };
+
+protected:
+    LLHUDEffectResetSkeleton(const U8 type);
+    ~LLHUDEffectResetSkeleton();
+
+    /*virtual*/ void packData(LLMessageSystem *mesgsys);
+    /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
+
+    void update();
+private:
+    bool                        mResetAnimations;
+};
+
+#endif // LL_LLHUDEFFECTRESETSKELETON_H
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp
index e6fbfbfb38..04e9e2dff2 100644
--- a/indra/newview/llhudobject.cpp
+++ b/indra/newview/llhudobject.cpp
@@ -36,6 +36,7 @@
 #include "llhudeffecttrail.h"
 #include "llhudeffectlookat.h"
 #include "llhudeffectpointat.h"
+#include "llhudeffectresetskeleton.h"
 #include "llhudnametag.h"
 #include "llvoicevisualizer.h"
 
@@ -241,6 +242,9 @@ LLHUDEffect *LLHUDObject::addHUDEffect(const U8 type)
     case LL_HUD_EFFECT_BLOB:
         hud_objectp = new LLHUDEffectBlob(type);
         break;
+    case LL_HUD_EFFECT_RESET_SKELETON:
+        hud_objectp = new LLHUDEffectResetSkeleton(type);
+        break;
     default:
         LL_WARNS() << "Unknown type of hud effect:" << (U32) type << LL_ENDL;
     }
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
index 8c628e3f92..f683f21e96 100644
--- a/indra/newview/llhudobject.h
+++ b/indra/newview/llhudobject.h
@@ -96,7 +96,8 @@ public:
         LL_HUD_EFFECT_POINTAT,
         LL_HUD_EFFECT_VOICE_VISUALIZER, // Ventrella
         LL_HUD_NAME_TAG,
-        LL_HUD_EFFECT_BLOB
+        LL_HUD_EFFECT_BLOB,
+        LL_HUD_EFFECT_RESET_SKELETON
     };
 protected:
     static void sortObjects();
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 4e8bcc4f7a..4c02511268 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -422,6 +422,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
     U8 *binary_bucket,
     S32 binary_bucket_size,
     LLHost &sender,
+    LLSD metadata,
     LLUUID aux_id)
 {
     LLChat chat;
@@ -451,6 +452,28 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
     bool is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
         LLMuteList::isLinden(name);
 
+    /***
+    * The simulator may have flagged this sender as a bot, if the viewer would like to display
+    * the chat text in a different color or font, the below code is how the viewer can
+    * tell if the sender is a bot.
+    *-----------------------------------------------------
+    bool is_bot = false;
+    if (metadata.has("sender"))
+    {   // The server has identified this sender as a bot.
+        is_bot = metadata["sender"]["bot"].asBoolean();
+    }
+    *-----------------------------------------------------
+    */
+
+    std::string notice_name;
+    LLSD notice_args;
+    if (metadata.has("notice"))
+    {   // The server has injected a notice into the IM conversation.
+        // These will be things like bot notifications, etc.
+        notice_name = metadata["notice"]["id"].asString();
+        notice_args = metadata["notice"]["data"];
+    }
+
     chat.mMuted = is_muted;
     chat.mFromID = from_id;
     chat.mFromName = name;
@@ -544,7 +567,7 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
             }
             else
             {
-                // standard message, not from system
+                // standard message, server may have injected a notice into the conversation.
                 std::string saved;
                 if (offline == IM_OFFLINE)
                 {
@@ -579,8 +602,17 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
                             region_message = true;
                         }
                     }
-                    gIMMgr->addMessage(
-                        session_id,
+
+                    std::string real_name;
+
+                    if (!notice_name.empty())
+                    {   // The simulator has injected some sort of notice into the conversation.
+                        // findString will only replace the contents of buffer if the notice_id is found.
+                        LLTrans::findString(buffer, notice_name, notice_args);
+                        real_name = SYSTEM_FROM;
+                    }
+
+                    gIMMgr->addMessage(session_id,
                         from_id,
                         name,
                         buffer,
@@ -591,7 +623,9 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
                         region_id,
                         position,
                         region_message,
-                        timestamp);
+                        timestamp,
+                        LLUUID::null,
+                        real_name);
                 }
                 else
                 {
@@ -1619,6 +1653,12 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
             from_group = message_data["from_group"].asString() == "Y";
         }
 
+        LLSD metadata;
+        if (message_data.has("metadata"))
+        {
+            metadata = message_data["metadata"];
+        }
+
         EInstantMessage dialog = static_cast<EInstantMessage>(message_data["dialog"].asInteger());
         LLUUID session_id = message_data["transaction-id"].asUUID();
         if (session_id.isNull() && dialog == IM_FROM_TASK)
@@ -1646,6 +1686,7 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
                     local_bin_bucket.data(),
                     S32(local_bin_bucket.size()),
                     local_sender,
+                    metadata,
                     message_data["asset_id"].asUUID());
             });
 
diff --git a/indra/newview/llimprocessing.h b/indra/newview/llimprocessing.h
index 030d28b198..66ffc59ae0 100644
--- a/indra/newview/llimprocessing.h
+++ b/indra/newview/llimprocessing.h
@@ -48,6 +48,7 @@ public:
         U8 *binary_bucket,
         S32 binary_bucket_size,
         LLHost &sender,
+        LLSD metadata,
         LLUUID aux_id = LLUUID::null);
 
     // Either receives list of offline messages from 'ReadOfflineMsgs' capability
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 756f3b33ed..acabd97d57 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1691,6 +1691,8 @@ bool LLIMModel::logToFile(const std::string& file_name, const std::string& from,
     }
     else
     {
+        // will check KeepConversationLogTranscripts on its own
+        LLConversationLog::instance().cache();
         return false;
     }
 }
@@ -3144,9 +3146,16 @@ void LLIMMgr::addMessage(
     const LLUUID& region_id,
     const LLVector3& position,
     bool is_region_msg,
-    U32 timestamp)      // May be zero
+    U32 timestamp,  // May be zero
+    LLUUID display_id,
+    std::string_view display_name)
 {
     LLUUID other_participant_id = target_id;
+    std::string message_display_name = (display_name.empty()) ? from : std::string(display_name);
+    if (display_id.isNull() && (display_name.empty()))
+    {
+        display_id = other_participant_id;
+    }
 
     LLUUID new_session_id = session_id;
     if (new_session_id.isNull())
@@ -3243,7 +3252,7 @@ void LLIMMgr::addMessage(
             }
 
             //Play sound for new conversations
-            if (!skip_message & !gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation")))
+            if (!skip_message && !gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation")))
             {
                 make_ui_sound("UISndNewIncomingIMSession");
             }
@@ -3257,7 +3266,7 @@ void LLIMMgr::addMessage(
 
     if (!LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !skip_message)
     {
-        LLIMModel::instance().addMessage(new_session_id, from, other_participant_id, msg, true, is_region_msg, timestamp);
+        LLIMModel::instance().addMessage(new_session_id, message_display_name, display_id, msg, true, is_region_msg, timestamp);
     }
 
     // Open conversation floater if offline messages are present
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index 61776860e3..23f90ca795 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -368,7 +368,9 @@ public:
                     const LLUUID& region_id = LLUUID::null,
                     const LLVector3& position = LLVector3::zero,
                     bool is_region_msg = false,
-                    U32 timestamp = 0);
+                    U32 timestamp = 0,
+                    LLUUID display_id = LLUUID::null,
+                    std::string_view display_name = "");
 
     void addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args);
 
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index 24dbe61bad..9f0d236826 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -115,7 +115,6 @@ public:
 
 protected:
     LLPointer<LLViewerFetchedTexture> m_Image;
-    S32         mImageBoostLevel = LLGLTexture::BOOST_NONE;
     std::string mLoadingText;
 };
 
@@ -128,12 +127,8 @@ LLTexturePreviewView::LLTexturePreviewView(const LLView::Params& p)
 
 LLTexturePreviewView::~LLTexturePreviewView()
 {
-    if (m_Image)
-    {
-        m_Image->setBoostLevel(mImageBoostLevel);
         m_Image = nullptr;
     }
-}
 
 void LLTexturePreviewView::draw()
 {
@@ -153,18 +148,18 @@ void LLTexturePreviewView::draw()
         bool isLoading = (!m_Image->isFullyLoaded()) && (m_Image->getDiscardLevel() > 0);
         if (isLoading)
             LLFontGL::getFontSansSerif()->renderUTF8(mLoadingText, 0, rctClient.mLeft + 3, rctClient.mTop - 25, LLColor4::white, LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::DROP_SHADOW);
-        m_Image->addTextureStats((isLoading) ? MAX_IMAGE_AREA : (F32)(rctClient.getWidth() * rctClient.getHeight()));
+
+        m_Image->setKnownDrawSize(MAX_IMAGE_SIZE, MAX_IMAGE_SIZE);
     }
 }
 
 void LLTexturePreviewView::setImageFromAssetId(const LLUUID& idAsset)
 {
-    m_Image = LLViewerTextureManager::getFetchedTexture(idAsset, FTT_DEFAULT, MIPMAP_TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+    m_Image = LLViewerTextureManager::getFetchedTexture(idAsset, FTT_DEFAULT, MIPMAP_TRUE, LLGLTexture::BOOST_THUMBNAIL);
     if (m_Image)
     {
-        mImageBoostLevel = m_Image->getBoostLevel();
-        m_Image->setBoostLevel(LLGLTexture::BOOST_PREVIEW);
         m_Image->forceToSaveRawImage(0);
+        m_Image->setKnownDrawSize(MAX_IMAGE_SIZE, MAX_IMAGE_SIZE);
         if ( (!m_Image->isFullyLoaded()) && (!m_Image->hasFetcher()) )
         {
             if (m_Image->isInFastCacheList())
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 15190854a2..7710cda45b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -830,6 +830,8 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 {
     const LLInventoryObject *obj = getInventoryObject();
     bool single_folder_root = (mRoot == NULL);
+    bool is_cof = isCOFFolder();
+    bool is_inbox = isInboxFolder();
 
     if (obj)
     {
@@ -844,7 +846,8 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
             disabled_items.push_back(std::string("Copy"));
         }
 
-        if (isAgentInventory() && !single_folder_root && !isMarketplaceListingsFolder())
+        bool is_agent_inventory = isAgentInventory();
+        if (is_agent_inventory && !single_folder_root && !is_cof && !is_inbox)
         {
             items.push_back(std::string("New folder from selected"));
             items.push_back(std::string("Subfolder Separator"));
@@ -857,6 +860,19 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
             }
         }
 
+        if (isFavorite())
+        {
+            items.push_back(std::string("Remove from Favorites"));
+        }
+        else if (is_agent_inventory && !gInventory.isObjectDescendentOf(mUUID, gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH)))
+        {
+            items.push_back(std::string("Add to Favorites"));
+            if (gInventory.getRootFolderID() == mUUID)
+            {
+                disabled_items.push_back(std::string("Add to Favorites"));
+            }
+        }
+
         if (obj->getIsLinkType())
         {
             items.push_back(std::string("Find Original"));
@@ -869,6 +885,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
             if (!isItemMovable() || !canMenuCut())
             {
                 disabled_items.push_back(std::string("Cut"));
+                disabled_items.push_back(std::string("New folder from selected"));
             }
         }
         else
@@ -878,7 +895,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
                 items.push_back(std::string("Find Links"));
             }
 
-            if (!isInboxFolder() && !single_folder_root)
+            if (!is_inbox && !single_folder_root)
             {
                 items.push_back(std::string("Rename"));
                 if (!isItemRenameable() || ((flags & FIRST_SELECTED_ITEM) == 0))
@@ -918,6 +935,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
             if (!isItemMovable() || !canMenuCut())
             {
                 disabled_items.push_back(std::string("Cut"));
+                disabled_items.push_back(std::string("New folder from selected"));
             }
 
             if (canListOnMarketplace() && !isMarketplaceListingsFolder() && !isInboxFolder())
@@ -940,7 +958,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
     }
 
     // Don't allow items to be pasted directly into the COF or the inbox
-    if (!isCOFFolder() && !isInboxFolder())
+    if (!is_cof && !is_inbox)
     {
         items.push_back(std::string("Paste"));
     }
@@ -1334,6 +1352,13 @@ bool LLInvFVBridge::isAgentInventory() const
     return model->isObjectDescendentOf(mUUID, gInventory.getRootFolderID());
 }
 
+bool LLInvFVBridge::isAgentInventoryRoot() const
+{
+    const LLInventoryModel* model = getInventoryModel();
+    if(!model) return false;
+    return gInventory.getRootFolderID() == mUUID;
+}
+
 bool LLInvFVBridge::isCOFFolder() const
 {
     return LLAppearanceMgr::instance().getIsInCOF(mUUID);
@@ -2281,7 +2306,21 @@ const LLUUID& LLItemBridge::getThumbnailUUID() const
     return LLUUID::null;
 }
 
-// virtual
+bool LLItemBridge::isFavorite() const
+{
+    LLViewerInventoryItem* item = NULL;
+    LLInventoryModel* model = getInventoryModel();
+    if (model)
+    {
+        item = model->getItem(mUUID);
+    }
+    if (item)
+    {
+        return get_is_favorite(item);
+    }
+    return false;
+}
+
 bool LLItemBridge::isItemPermissive() const
 {
     if (LLViewerInventoryItem* item = getItem())
@@ -2426,6 +2465,16 @@ const LLUUID& LLFolderBridge::getThumbnailUUID() const
     return LLUUID::null;
 }
 
+bool LLFolderBridge::isFavorite() const
+{
+    LLViewerInventoryCategory* cat = getCategory();
+    if (cat)
+    {
+        return cat->getIsFavorite();
+    }
+    return false;
+}
+
 void LLFolderBridge::update()
 {
     // we know we have children but  haven't  fetched them (doesn't obey filter)
@@ -4274,6 +4323,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
         }
 
         disabled_items.push_back(std::string("New Folder"));
+        disabled_items.push_back(std::string("upload_options"));
         disabled_items.push_back(std::string("upload_def"));
         disabled_items.push_back(std::string("create_new"));
     }
@@ -4299,6 +4349,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
     {
         disabled_items.push_back(std::string("New Folder"));
         disabled_items.push_back(std::string("New Listing Folder"));
+        disabled_items.push_back(std::string("upload_options"));
         disabled_items.push_back(std::string("upload_def"));
         disabled_items.push_back(std::string("create_new"));
     }
@@ -4365,6 +4416,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
                 }
                 if (!isMarketplaceListingsFolder())
                 {
+                    items.push_back(std::string("upload_options"));
                     items.push_back(std::string("upload_def"));
                     items.push_back(std::string("create_new"));
                     items.push_back(std::string("New Script"));
@@ -4398,6 +4450,15 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
                 items.push_back(std::string("Rename"));
                 items.push_back(std::string("thumbnail"));
 
+                if (cat->getIsFavorite())
+                {
+                    items.push_back(std::string("Remove from Favorites"));
+                }
+                else
+                {
+                    items.push_back(std::string("Add to Favorites"));
+                }
+
                 addDeleteContextMenuOptions(items, disabled_items);
                 // EXT-4030: disallow deletion of currently worn outfit
                 const LLViewerInventoryItem *base_outfit_link = LLAppearanceMgr::instance().getBaseOutfitLink();
@@ -6909,12 +6970,13 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action)
         item = (LLViewerInventoryItem*)gInventory.getItem(object_id);
         if(item && gInventory.isObjectDescendentOf(object_id, gInventory.getRootFolderID()))
         {
-            rez_attachment(item, NULL, true); // Replace if "Wear"ing.
+            static LLCachedControl<bool> replace_item(gSavedSettings, "InventoryAddAttachmentBehavior", false);
+            rez_attachment(item, NULL, ("attach" == action) ? replace_item() : true); // Replace if "Wear"ing.
         }
         else if(item && item->isFinished())
         {
             // must be in library. copy it to our inventory and put it on.
-            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, (LLViewerJointAttachment*)0));
+            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, (LLViewerJointAttachment*)0, true));
             copy_inventory_item(
                 gAgent.getID(),
                 item->getPermissions().getOwner(),
@@ -8039,7 +8101,8 @@ void LLObjectBridgeAction::attachOrDetach()
     }
     else
     {
-        LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, false); // Don't replace if adding.
+        static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryAddAttachmentBehavior", false);
+        LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, inventory_linking()); // Don't replace if adding.
     }
 }
 
@@ -8230,6 +8293,7 @@ void LLRecentItemsFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
         buildContextMenuOptions(flags, items, disabled_items);
 
     items.erase(std::remove(items.begin(), items.end(), std::string("New Folder")), items.end());
+    items.erase(std::remove(items.begin(), items.end(), std::string("New folder from selected")), items.end());
 
     hide_context_entries(menu, items, disabled_items);
 }
@@ -8264,6 +8328,51 @@ LLInvFVBridge* LLRecentInventoryBridgeBuilder::createBridge(
     return new_listener;
 }
 
+/************************************************************************/
+/* Favorites Inventory Panel related classes                               */
+/************************************************************************/
+void LLFavoritesFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
+{
+    // todo: consider things that should be disabled
+    menuentry_vec_t disabled_items, items;
+    buildContextMenuOptions(flags, items, disabled_items);
+
+    items.erase(std::remove(items.begin(), items.end(), std::string("New Folder")), items.end());
+    items.erase(std::remove(items.begin(), items.end(), std::string("New folder from selected")), items.end());
+
+    hide_context_entries(menu, items, disabled_items);
+}
+
+LLInvFVBridge* LLFavoritesInventoryBridgeBuilder::createBridge(
+    LLAssetType::EType asset_type,
+    LLAssetType::EType actual_asset_type,
+    LLInventoryType::EType inv_type,
+    LLInventoryPanel* inventory,
+    LLFolderViewModelInventory* view_model,
+    LLFolderView* root,
+    const LLUUID& uuid,
+    U32 flags /*= 0x00*/) const
+{
+    LLInvFVBridge* new_listener = NULL;
+    if (asset_type == LLAssetType::AT_CATEGORY
+        && actual_asset_type != LLAssetType::AT_LINK_FOLDER)
+    {
+        new_listener = new LLFavoritesFolderBridge(inv_type, inventory, root, uuid);
+    }
+    else
+    {
+        new_listener = LLInventoryFolderViewModelBuilder::createBridge(asset_type,
+            actual_asset_type,
+            inv_type,
+            inventory,
+            view_model,
+            root,
+            uuid,
+            flags);
+    }
+    return new_listener;
+}
+
 LLFolderViewGroupedItemBridge::LLFolderViewGroupedItemBridge()
 {
 }
@@ -8274,7 +8383,7 @@ void LLFolderViewGroupedItemBridge::groupFilterContextMenu(folder_view_item_dequ
     menuentry_vec_t disabled_items;
     if (get_selection_item_uuids(selected_items, ids))
     {
-        if (!LLAppearanceMgr::instance().canAddWearables(ids) && canWearSelected(ids))
+        if (!LLAppearanceMgr::instance().canAddWearables(ids, false) && canWearSelected(ids))
         {
             disabled_items.push_back(std::string("Wearable And Object Wear"));
             disabled_items.push_back(std::string("Wearable Add"));
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 3e7f74384b..1b80ac163c 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -86,6 +86,7 @@ public:
     //--------------------------------------------------------------------
     virtual const LLUUID& getUUID() const { return mUUID; }
     virtual const LLUUID& getThumbnailUUID() const { return LLUUID::null; }
+    virtual bool isFavorite() const { return false; }
     virtual void clearDisplayName() { mDisplayName.clear(); }
     virtual void restoreItem() {}
     virtual void restoreToWorld() {}
@@ -175,6 +176,7 @@ protected:
     bool isLinkedObjectMissing() const; // Is this a linked obj whose baseobj is not in inventory?
 
     bool isAgentInventory() const; // false if lost or in the inventory library
+    bool isAgentInventoryRoot() const; // true if worn by agent
     bool isCOFFolder() const;       // true if COF or descendant of
     bool isInboxFolder() const;     // true if COF or descendant of   marketplace inbox
 
@@ -259,6 +261,7 @@ public:
 
     LLViewerInventoryItem* getItem() const;
     virtual const LLUUID& getThumbnailUUID() const;
+    virtual bool isFavorite() const;
 
 protected:
     bool confirmRemoveItem(const LLSD& notification, const LLSD& response);
@@ -301,6 +304,7 @@ public:
     virtual std::string getLabelSuffix() const;
     virtual LLFontGL::StyleFlags getLabelStyle() const;
     virtual const LLUUID& getThumbnailUUID() const;
+    virtual bool isFavorite() const;
 
     void setShowDescendantsCount(bool show_count) {mShowDescendantsCount = show_count;}
 
@@ -754,6 +758,45 @@ public:
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Favorites Inventory Panel related classes
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+// Overridden version of the Inventory-Folder-View-Bridge for Folders
+class LLFavoritesFolderBridge : public LLFolderBridge
+{
+    friend class LLInvFVBridgeAction;
+public:
+    // Creates context menu for Folders related to Recent Inventory Panel.
+    // Uses base logic and than removes from visible items "New..." menu items.
+    LLFavoritesFolderBridge(LLInventoryType::EType type,
+        LLInventoryPanel* inventory,
+        LLFolderView* root,
+        const LLUUID& uuid) :
+        LLFolderBridge(inventory, root, uuid)
+    {
+        mInvType = type;
+    }
+    /*virtual*/ void buildContextMenu(LLMenuGL& menu, U32 flags);
+};
+
+// Bridge builder to create Inventory-Folder-View-Bridge for Recent Inventory Panel
+class LLFavoritesInventoryBridgeBuilder : public LLInventoryFolderViewModelBuilder
+{
+public:
+    LLFavoritesInventoryBridgeBuilder() {}
+    // Overrides FolderBridge for Recent Inventory Panel.
+    // It use base functionality for bridges other than FolderBridge.
+    virtual LLInvFVBridge* createBridge(LLAssetType::EType asset_type,
+        LLAssetType::EType actual_asset_type,
+        LLInventoryType::EType inv_type,
+        LLInventoryPanel* inventory,
+        LLFolderViewModelInventory* view_model,
+        LLFolderView* root,
+        const LLUUID& uuid,
+        U32 flags = 0x00) const;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Marketplace Inventory Panel related classes
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -780,7 +823,7 @@ private:
 
 void rez_attachment(LLViewerInventoryItem* item,
                     LLViewerJointAttachment* attachment,
-                    bool replace = false);
+                    bool replace);
 
 // Move items from an in-world object's "Contents" folder to a specified
 // folder in agent inventory.
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 5c0905af3c..6c5421596b 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -64,6 +64,7 @@ LLInventoryFilter::FilterOps::FilterOps(const Params& p)
     mFilterUUID(p.uuid),
     mFilterLinks(p.links),
     mFilterThumbnails(p.thumbnails),
+    mFilterFavorites(p.favorites),
     mSearchVisibility(p.search_visibility)
 {
 }
@@ -159,6 +160,7 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item)
     passed = passed && checkAgainstCreator(listener);
     passed = passed && checkAgainstSearchVisibility(listener);
 
+    passed = passed && checkAgainstFilterFavorites(listener->getUUID());
     passed = passed && checkAgainstFilterThumbnails(listener->getUUID());
 
     return passed;
@@ -221,6 +223,19 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
         return false;
     }
 
+    const LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id);
+    if (cat && cat->getIsFavorite())
+    {
+        if (mFilterOps.mFilterFavorites == FILTER_ONLY_FAVORITES)
+        {
+            return true;
+        }
+        if (mFilterOps.mFilterFavorites == FILTER_EXCLUDE_FAVORITES)
+        {
+            return false;
+        }
+    }
+
     // Marketplace folder filtering
     const U32 filterTypes = mFilterOps.mFilterTypes;
     const U32 marketplace_filter = FILTERTYPE_MARKETPLACE_ACTIVE | FILTERTYPE_MARKETPLACE_INACTIVE |
@@ -273,6 +288,16 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
         }
     }
 
+    if (filterTypes & FILTERTYPE_NO_TRASH_ITEMS)
+    {
+        const LLUUID trash_uuid = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
+        // If not a descendant of the marketplace listings root, then the nesting depth is -1 by definition
+        if (gInventory.isObjectDescendentOf(folder_id, trash_uuid))
+        {
+            return false;
+        }
+    }
+
     // show folder links
     LLViewerInventoryItem* item = gInventory.getItem(folder_id);
     if (item && item->getActualType() == LLAssetType::AT_LINK_FOLDER)
@@ -611,6 +636,24 @@ bool LLInventoryFilter::checkAgainstFilterThumbnails(const LLUUID& object_id) co
     return true;
 }
 
+bool LLInventoryFilter::checkAgainstFilterFavorites(const LLUUID& object_id) const
+{
+    const LLInventoryObject* object = gInventory.getObject(object_id);
+    if (!object) return true;
+
+
+    if (mFilterOps.mFilterFavorites != FILTER_INCLUDE_FAVORITES)
+    {
+        bool is_favorite = get_is_favorite(object);
+        if (is_favorite && (mFilterOps.mFilterFavorites == FILTER_EXCLUDE_FAVORITES))
+            return false;
+        if (!is_favorite && (mFilterOps.mFilterFavorites == FILTER_ONLY_FAVORITES))
+            return false;
+    }
+
+    return true;
+}
+
 bool LLInventoryFilter::checkAgainstCreator(const LLFolderViewModelItemInventory* listener) const
 {
     if (!listener)
@@ -811,6 +854,32 @@ void LLInventoryFilter::setFilterThumbnails(U64 filter_thumbnails)
     mFilterOps.mFilterThumbnails = filter_thumbnails;
 }
 
+void LLInventoryFilter::setFilterFavorites(U64 filter_favorites)
+{
+    if (mFilterOps.mFilterFavorites != filter_favorites)
+    {
+        if (mFilterOps.mFilterFavorites == FILTER_EXCLUDE_FAVORITES
+            && filter_favorites == FILTER_ONLY_FAVORITES)
+        {
+            setModified(FILTER_RESTART);
+        }
+        else if (mFilterOps.mFilterFavorites == FILTER_ONLY_FAVORITES
+            && filter_favorites == FILTER_EXCLUDE_FAVORITES)
+        {
+            setModified(FILTER_RESTART);
+        }
+        else if (mFilterOps.mFilterFavorites == FILTER_INCLUDE_FAVORITES)
+        {
+            setModified(FILTER_MORE_RESTRICTIVE);
+        }
+        else
+        {
+            setModified(FILTER_LESS_RESTRICTIVE);
+        }
+    }
+    mFilterOps.mFilterFavorites = filter_favorites;
+}
+
 void LLInventoryFilter::setFilterEmptySystemFolders()
 {
     mFilterOps.mFilterTypes |= FILTERTYPE_EMPTYFOLDERS;
@@ -923,6 +992,11 @@ void LLInventoryFilter::toggleSearchVisibilityLibrary()
     }
 }
 
+void LLInventoryFilter::setFilterNoTrashFolder()
+{
+    mFilterOps.mFilterTypes |= FILTERTYPE_NO_TRASH_ITEMS;
+}
+
 void LLInventoryFilter::setFilterNoMarketplaceFolder()
 {
     mFilterOps.mFilterTypes |= FILTERTYPE_NO_MARKETPLACE_ITEMS;
@@ -1615,6 +1689,11 @@ U64 LLInventoryFilter::getFilterThumbnails() const
     return mFilterOps.mFilterThumbnails;
 }
 
+U64 LLInventoryFilter::getFilterFavorites() const
+{
+    return mFilterOps.mFilterFavorites;
+}
+
 bool LLInventoryFilter::hasFilterString() const
 {
     return mFilterSubString.size() > 0;
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 7e64a03e73..2bdc646084 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -61,6 +61,7 @@ public:
         FILTERTYPE_NO_MARKETPLACE_ITEMS = 0x1 << 10,         // pass iff folder is not under the marketplace
         FILTERTYPE_WORN = 0x1 << 11,     // pass if item is worn
         FILTERTYPE_SETTINGS = 0x1 << 12,    // pass if the item is a settings object
+        FILTERTYPE_NO_TRASH_ITEMS = 0x1 << 13,         // pass iff folder is not under the marketplace
     };
 
     enum EFilterDateDirection
@@ -83,6 +84,13 @@ public:
         FILTER_ONLY_THUMBNAILS
     };
 
+    enum EFilterFavorite
+    {
+        FILTER_INCLUDE_FAVORITES,
+        FILTER_EXCLUDE_FAVORITES,
+        FILTER_ONLY_FAVORITES
+    };
+
     enum ESortOrderType
     {
         SO_NAME = 0,                        // Sort inventory by name
@@ -149,6 +157,7 @@ public:
             Optional<PermissionMask>    permissions;
             Optional<EFilterCreatorType> creator_type;
             Optional<EFilterThumbnail> thumbnails;
+            Optional<EFilterFavorite> favorites;
 
             Params()
             :   types("filter_types", FILTERTYPE_OBJECT),
@@ -156,6 +165,7 @@ public:
                 wearable_types("wearable_types", 0xffffFFFFffffFFFFULL),
                 settings_types("settings_types", 0xffffFFFFffffFFFFULL),
                 thumbnails("thumbnails", FILTER_INCLUDE_THUMBNAILS),
+                favorites("favorites", FILTER_INCLUDE_FAVORITES),
                 category_types("category_types", 0xffffFFFFffffFFFFULL),
                 links("links", FILTERLINK_INCLUDE_LINKS),
                 search_visibility("search_visibility", 0xFFFFFFFF),
@@ -177,6 +187,7 @@ public:
                         mFilterWearableTypes,
                         mFilterSettingsTypes, // for _SETTINGS
                         mFilterThumbnails,
+                        mFilterFavorites,
                         mFilterLinks,
                         mFilterCategoryTypes; // For _CATEGORY
         LLUUID          mFilterUUID;          // for UUID
@@ -220,6 +231,7 @@ public:
     U64                 getFilterSettingsTypes() const;
     U64                 getSearchVisibilityTypes() const;
     U64                 getFilterThumbnails() const;
+    U64                 getFilterFavorites() const;
 
     bool                isFilterObjectTypesWith(LLInventoryType::EType t) const;
     void                setFilterObjectTypes(U64 types);
@@ -233,8 +245,10 @@ public:
     void                setFilterMarketplaceInactiveFolders();
     void                setFilterMarketplaceUnassociatedFolders();
     void                setFilterMarketplaceListingFolders(bool select_only_listing_folders);
+    void                setFilterNoTrashFolder();
     void                setFilterNoMarketplaceFolder();
     void                setFilterThumbnails(U64 filter_thumbnails);
+    void                setFilterFavorites(U64 filter_favorites);
     void                updateFilterTypes(U64 types, U64& current_types);
     void                setSearchType(ESearchType type);
     ESearchType         getSearchType() { return mSearchType; }
@@ -339,6 +353,7 @@ public:
     LLInventoryFilter& operator =(const LLInventoryFilter& other);
 
     bool checkAgainstFilterThumbnails(const LLUUID& object_id) const;
+    bool checkAgainstFilterFavorites(const LLUUID& object_id) const;
 
 private:
     bool                areDateLimitsSet();
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 1ccefa3212..a2626daa2e 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -51,6 +51,7 @@
 #include "lldirpicker.h"
 #include "lldonotdisturbnotificationstorage.h"
 #include "llfloatermarketplacelistings.h"
+#include "llfloatermodelpreview.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llfocusmgr.h"
 #include "llfolderview.h"
@@ -62,6 +63,7 @@
 #include "llinventorymodel.h"
 #include "llinventorypanel.h"
 #include "lllineeditor.h"
+#include "llmaterialeditor.h"
 #include "llmarketplacenotifications.h"
 #include "llmarketplacefunctions.h"
 #include "llmenugl.h"
@@ -86,6 +88,7 @@
 #include "llviewermessage.h"
 #include "llviewerfoldertype.h"
 #include "llviewerobjectlist.h"
+#include "llviewermenufile.h"
 #include "llviewerregion.h"
 #include "llviewerwindow.h"
 #include "llvoavatarself.h"
@@ -2147,21 +2150,10 @@ void validate_marketplacelistings(
 
 void change_item_parent(const LLUUID& item_id, const LLUUID& new_parent_id)
 {
-    LLInventoryItem* inv_item = gInventory.getItem(item_id);
+    LLViewerInventoryItem* inv_item = gInventory.getItem(item_id);
     if (inv_item)
     {
-        LLInventoryModel::update_list_t update;
-        LLInventoryModel::LLCategoryUpdate old_folder(inv_item->getParentUUID(), -1);
-        update.push_back(old_folder);
-        LLInventoryModel::LLCategoryUpdate new_folder(new_parent_id, 1);
-        update.push_back(new_folder);
-        gInventory.accountForUpdate(update);
-
-        LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(inv_item);
-        new_item->setParent(new_parent_id);
-        new_item->updateParentOnServer(false);
-        gInventory.updateItem(new_item);
-        gInventory.notifyObservers();
+        gInventory.changeItemParent(inv_item, new_parent_id, false);
     }
 }
 
@@ -2169,17 +2161,17 @@ void move_items_to_folder(const LLUUID& new_cat_uuid, const uuid_vec_t& selected
 {
     for (uuid_vec_t::const_iterator it = selected_uuids.begin(); it != selected_uuids.end(); ++it)
     {
-        LLInventoryItem* inv_item = gInventory.getItem(*it);
+        LLViewerInventoryItem* inv_item = gInventory.getItem(*it);
         if (inv_item)
         {
-            change_item_parent(*it, new_cat_uuid);
+            gInventory.changeItemParent(inv_item, new_cat_uuid, false);
         }
         else
         {
-            LLInventoryCategory* inv_cat = gInventory.getCategory(*it);
+            LLViewerInventoryCategory* inv_cat = gInventory.getCategory(*it);
             if (inv_cat && !LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
             {
-                gInventory.changeCategoryParent((LLViewerInventoryCategory*)inv_cat, new_cat_uuid, false);
+                gInventory.changeCategoryParent(inv_cat, new_cat_uuid, false);
             }
         }
     }
@@ -2418,6 +2410,143 @@ void ungroup_folder_items(const LLUUID& folder_id)
     gInventory.notifyObservers();
 }
 
+class LLUpdateFavorite : public LLInventoryCallback
+{
+public:
+    LLUpdateFavorite(const LLUUID& inv_item_id)
+        : mInvItemID(inv_item_id)
+    {}
+    /* virtual */ void fire(const LLUUID& inv_item_id) override
+    {
+        gInventory.addChangedMask(LLInventoryObserver::UPDATE_FAVORITE, mInvItemID);
+
+        LLInventoryModel::item_array_t items;
+        LLInventoryModel::cat_array_t cat_array;
+        LLLinkedItemIDMatches matches(mInvItemID);
+        gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
+            cat_array,
+            items,
+            LLInventoryModel::INCLUDE_TRASH,
+            matches);
+
+        std::set<LLUUID> link_ids;
+        for (LLInventoryModel::item_array_t::iterator it = items.begin(); it != items.end(); ++it)
+        {
+            LLPointer<LLViewerInventoryItem> item = *it;
+
+            gInventory.addChangedMask(LLInventoryObserver::UPDATE_FAVORITE, item->getUUID());
+        }
+
+        gInventory.notifyObservers();
+    }
+private:
+    LLUUID mInvItemID;
+};
+
+void favorite_send(LLInventoryObject* obj, const LLUUID& obj_id, bool favorite)
+{
+    LLSD updates;
+    if (favorite)
+    {
+        updates["favorite"] = LLSD().with("toggled", true);
+    }
+    else
+    {
+        updates["favorite"] = LLSD();
+    }
+
+    LLPointer<LLInventoryCallback> cb = new LLUpdateFavorite(obj_id);
+
+    LLViewerInventoryCategory* view_folder = dynamic_cast<LLViewerInventoryCategory*>(obj);
+    if (view_folder)
+    {
+        update_inventory_category(obj_id, updates, cb);
+    }
+    LLViewerInventoryItem* view_item = dynamic_cast<LLViewerInventoryItem*>(obj);
+    if (view_item)
+    {
+        update_inventory_item(obj_id, updates, cb);
+    }
+}
+
+bool get_is_favorite(const LLInventoryObject* object)
+{
+    if (object->getIsLinkType())
+    {
+        LLInventoryObject* obj = gInventory.getObject(object->getLinkedUUID());
+        return obj && obj->getIsFavorite();
+    }
+
+    return object->getIsFavorite();
+}
+
+bool get_is_favorite(const LLUUID& obj_id)
+{
+    LLInventoryObject* object = gInventory.getObject(obj_id);
+    if (object && object->getIsLinkType())
+    {
+        LLInventoryObject* obj = gInventory.getObject(object->getLinkedUUID());
+        return obj && obj->getIsFavorite();
+    }
+
+    return object->getIsFavorite();
+}
+
+void set_favorite(const LLUUID& obj_id, bool favorite)
+{
+    LLInventoryObject* obj = gInventory.getObject(obj_id);
+
+    if (obj && obj->getIsLinkType())
+    {
+        if (!favorite && obj->getIsFavorite())
+        {
+            // Links currently aren't supposed to be favorites,
+            // instead should show state of the original
+            LL_INFOS("Inventory") << "Recovering proper 'favorites' state of a link " << obj_id << LL_ENDL;
+            favorite_send(obj, obj_id, false);
+        }
+        obj = gInventory.getObject(obj->getLinkedUUID());
+    }
+
+    if (obj && obj->getIsFavorite() != favorite)
+    {
+        favorite_send(obj, obj->getUUID(), favorite);
+    }
+}
+
+void toggle_favorite(const LLUUID& obj_id)
+{
+    LLInventoryObject* obj = gInventory.getObject(obj_id);
+    if (obj && obj->getIsLinkType())
+    {
+        obj = gInventory.getObject(obj->getLinkedUUID());
+    }
+
+    if (obj)
+    {
+        favorite_send(obj, obj->getUUID(), !obj->getIsFavorite());
+    }
+}
+
+void toggle_favorites(const uuid_vec_t& ids)
+{
+    if (ids.size() == 0)
+    {
+        return;
+    }
+    if (ids.size() == 1)
+    {
+        toggle_favorite(ids[0]);
+        return;
+    }
+
+    bool new_val = !get_is_favorite(ids.front());
+    for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it)
+    {
+        set_favorite(*it, new_val);
+    }
+}
+
 std::string get_searchable_description(LLInventoryModel* model, const LLUUID& item_id)
 {
     if (model)
@@ -2713,6 +2842,20 @@ bool LLIsTypeWithPermissions::operator()(LLInventoryCategory* cat, LLInventoryIt
     return false;
 }
 
+bool LLFavoritesCollector::operator()(LLInventoryCategory* cat,
+    LLInventoryItem* item)
+{
+    if (item && item->getIsFavorite())
+    {
+        return true;
+    }
+    if (cat && cat->getIsFavorite())
+    {
+        return true;
+    }
+    return false;
+}
+
 bool LLBuddyCollector::operator()(LLInventoryCategory* cat,
                                   LLInventoryItem* item)
 {
@@ -3197,7 +3340,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 
                 for (LLInventoryModel::item_array_t::value_type& item : items)
                 {
-                    if (get_is_item_worn(item))
+                    if (!item->getIsLinkType() && get_is_item_worn(item))
                     {
                         has_worn = true;
                         LLWearableType::EType type = item->getWearableType();
@@ -3217,7 +3360,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
                 }
             }
             LLViewerInventoryItem* item = gInventory.getItem(obj_id);
-            if (item && get_is_item_worn(item))
+            if (item && !item->getIsLinkType() && get_is_item_worn(item))
             {
                 has_worn = true;
                 LLWearableType::EType type = item->getWearableType();
@@ -3423,7 +3566,6 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
     }
     else if ("new_folder_from_selected" == action)
     {
-
         LLInventoryObject* first_item = gInventory.getObject(*ids.begin());
         if (!first_item)
         {
@@ -3467,6 +3609,20 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
             ungroup_folder_items(*ids.begin());
         }
     }
+    else if ("add_to_favorites" == action)
+    {
+        for (const LLUUID& id : ids)
+        {
+            set_favorite(id, true);
+        }
+    }
+    else if ("remove_from_favorites" == action)
+    {
+        for (const LLUUID& id : ids)
+        {
+            set_favorite(id, false);
+        }
+    }
     else if ("thumbnail" == action)
     {
         if (selected_items.size() > 0)
@@ -3577,6 +3733,54 @@ void LLInventoryAction::removeItemFromDND(LLFolderView* root)
     }
 }
 
+void LLInventoryAction::fileUploadLocation(const LLUUID& dest_id, const std::string& action)
+{
+    if (action == "def_model")
+    {
+        gSavedPerAccountSettings.setString("ModelUploadFolder", dest_id.asString());
+    }
+    else if (action == "def_texture")
+    {
+        gSavedPerAccountSettings.setString("TextureUploadFolder", dest_id.asString());
+    }
+    else if (action == "def_sound")
+    {
+        gSavedPerAccountSettings.setString("SoundUploadFolder", dest_id.asString());
+    }
+    else if (action == "def_animation")
+    {
+        gSavedPerAccountSettings.setString("AnimationUploadFolder", dest_id.asString());
+    }
+    else if (action == "def_pbr_material")
+    {
+        gSavedPerAccountSettings.setString("PBRUploadFolder", dest_id.asString());
+    }
+    else if (action == "upload_texture")
+    {
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2, dest_id), LLFilePicker::FFLOAD_IMAGE, false);
+    }
+    else if (action == "upload_sound")
+    {
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2, dest_id), LLFilePicker::FFLOAD_WAV, false);
+    }
+    else if (action == "upload_animation")
+    {
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2, dest_id), LLFilePicker::FFLOAD_ANIM, false);
+    }
+    else if (action == "upload_model")
+    {
+        LLFloaterModelPreview::showModelPreview(dest_id);
+    }
+    else if (action == "upload_pbr_material")
+    {
+        LLMaterialEditor::importMaterial(dest_id);
+    }
+    else if (action == "upload_bulk")
+    {
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_bulk, _1, _2, true, dest_id), LLFilePicker::FFLOAD_ALL, true);
+    }
+}
+
 void LLInventoryAction::onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFolderView> root)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 13a64f21dc..a668cc31d8 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -116,6 +116,11 @@ bool can_move_to_my_outfits(LLInventoryModel* model, LLInventoryCategory* inv_ca
 std::string get_localized_folder_name(LLUUID cat_uuid);
 void new_folder_window(const LLUUID& folder_id);
 void ungroup_folder_items(const LLUUID& folder_id);
+bool get_is_favorite(const LLInventoryObject* object);
+bool get_is_favorite(const LLUUID& obj_id);
+void set_favorite(const LLUUID& obj_id, bool favorite);
+void toggle_favorite(const LLUUID& obj_id);
+void toggle_favorites(const uuid_vec_t& ids);
 std::string get_searchable_description(LLInventoryModel* model, const LLUUID& item_id);
 std::string get_searchable_creator_name(LLInventoryModel* model, const LLUUID& item_id);
 std::string get_searchable_UUID(LLInventoryModel* model, const LLUUID& item_id);
@@ -344,6 +349,18 @@ protected:
 };
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLFavoritesCollector
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class LLFavoritesCollector : public LLInventoryCollectFunctor
+{
+public:
+    LLFavoritesCollector() {}
+    virtual ~LLFavoritesCollector() {}
+    virtual bool operator()(LLInventoryCategory* cat,
+        LLInventoryItem* item);
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLBuddyCollector
 //
 // Simple class that collects calling cards that are not null, and not
@@ -601,6 +618,7 @@ struct LLInventoryAction
     static void callback_copySelected(const LLSD& notification, const LLSD& response, class LLInventoryModel* model, class LLFolderView* root, const std::string& action);
     static void onItemsRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFolderView> root);
     static void removeItemFromDND(LLFolderView* root);
+    static void fileUploadLocation(const LLUUID& dest_id, const std::string& action);
 
     static void saveMultipleTextures(const std::vector<std::string>& filenames, std::set<LLFolderViewItem*> selected_items, LLInventoryModel* model);
 
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c4f93cee98..56c5049019 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -634,7 +634,7 @@ void LLInventoryGallery::removeFromLastRow(LLInventoryGalleryItem* item)
     mItemPanels.pop_back();
 }
 
-LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn)
+LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn, bool is_favorite)
 {
     LLInventoryGalleryItem::Params giparams;
     giparams.visible = true;
@@ -645,6 +645,7 @@ LLInventoryGalleryItem* LLInventoryGallery::buildGalleryItem(std::string name, L
     gitem->setUUID(item_id);
     gitem->setGallery(this);
     gitem->setType(type, inventory_type, flags, is_link);
+    gitem->setFavorite(is_favorite);
     gitem->setLoadImmediately(mLoadThumbnailsImmediately);
     gitem->setThumbnail(thumbnail_id);
     gitem->setWorn(is_worn);
@@ -937,8 +938,19 @@ bool LLInventoryGallery::updateAddedItem(LLUUID item_id)
     }
 
     bool res = false;
-
-    LLInventoryGalleryItem* item = buildGalleryItem(name, item_id, obj->getType(), thumbnail_id, inventory_type, misc_flags, obj->getCreationDate(), obj->getIsLinkType(), is_worn);
+    bool is_favorite = get_is_favorite(obj);
+
+    LLInventoryGalleryItem* item = buildGalleryItem(
+        name,
+        item_id,
+        obj->getType(),
+        thumbnail_id,
+        inventory_type,
+        misc_flags,
+        obj->getCreationDate(),
+        obj->getIsLinkType(),
+        is_worn,
+        is_favorite);
     mItemMap.insert(LLInventoryGallery::gallery_item_map_t::value_type(item_id, item));
     if (mGalleryCreated)
     {
@@ -975,7 +987,7 @@ void LLInventoryGallery::updateRemovedItem(LLUUID item_id)
     mItemBuildQuery.erase(item_id);
 }
 
-void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
+void LLInventoryGallery::updateChangedItemData(LLUUID item_id, std::string name, bool is_favorite)
 {
     gallery_item_map_t::iterator iter = mItemMap.find(item_id);
     if (iter != mItemMap.end())
@@ -984,6 +996,7 @@ void LLInventoryGallery::updateChangedItemName(LLUUID item_id, std::string name)
         if (item)
         {
             item->setItemName(name);
+            item->setFavorite(is_favorite);
         }
     }
 }
@@ -1999,7 +2012,7 @@ void LLInventoryGallery::deleteSelection()
 
             for (LLInventoryModel::item_array_t::value_type& item : items)
             {
-                if (get_is_item_worn(item))
+                if (!item->getIsLinkType() && get_is_item_worn(item))
                 {
                     has_worn = true;
                     LLWearableType::EType type = item->getWearableType();
@@ -2020,7 +2033,7 @@ void LLInventoryGallery::deleteSelection()
         }
 
         LLViewerInventoryItem* item = gInventory.getItem(id);
-        if (item && get_is_item_worn(item))
+        if (item && !item->getIsLinkType() && get_is_item_worn(item))
         {
             has_worn = true;
             LLWearableType::EType type = item->getWearableType();
@@ -2333,7 +2346,7 @@ void LLInventoryGallery::refreshList(const LLUUID& category_id)
             return;
         }
 
-        updateChangedItemName(*items_iter, obj->getName());
+        updateChangedItemData(*items_iter, obj->getName(), get_is_favorite(obj));
         mNeedsArrange = true;
     }
 
@@ -2849,6 +2862,14 @@ void LLInventoryGalleryItem::setType(LLAssetType::EType type, LLInventoryType::E
     getChild<LLIconCtrl>("link_overlay")->setVisible(is_link);
 }
 
+void LLInventoryGalleryItem::setFavorite(bool is_favorite)
+{
+    getChild<LLIconCtrl>("fav_icon")->setVisible(is_favorite);
+    static const LLUIColor text_color = LLUIColorTable::instance().getColor("LabelTextColor", LLColor4::white);
+    static const LLUIColor favorite_color = LLUIColorTable::instance().getColor("InventoryFavoriteColor", LLColor4::white);
+    mNameText->setReadOnlyColor(is_favorite ? favorite_color : text_color);
+}
+
 void LLInventoryGalleryItem::setThumbnail(LLUUID id)
 {
     mDefaultImage = id.isNull();
diff --git a/indra/newview/llinventorygallery.h b/indra/newview/llinventorygallery.h
index 59d08d19ed..7f53f9998d 100644
--- a/indra/newview/llinventorygallery.h
+++ b/indra/newview/llinventorygallery.h
@@ -102,7 +102,7 @@ public:
     void getCurrentCategories(uuid_vec_t& vcur);
     bool updateAddedItem(LLUUID item_id); // returns true if added item is visible
     void updateRemovedItem(LLUUID item_id);
-    void updateChangedItemName(LLUUID item_id, std::string name);
+    void updateChangedItemData(LLUUID item_id, std::string name, bool is_favorite);
     void updateItemThumbnail(LLUUID item_id);
     void updateWornItem(LLUUID item_id, bool is_worn);
 
@@ -227,7 +227,7 @@ private:
     bool updateRowsIfNeeded();
     void updateGalleryWidth();
 
-    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn);
+    LLInventoryGalleryItem* buildGalleryItem(std::string name, LLUUID item_id, LLAssetType::EType type, LLUUID thumbnail_id, LLInventoryType::EType inventory_type, U32 flags, time_t creation_date, bool is_link, bool is_worn, bool is_favorite);
     LLInventoryGalleryItem* getItem(const LLUUID& id) const;
 
     void buildGalleryPanel(int row_count);
@@ -343,6 +343,7 @@ public:
     void setHidden(bool hidden) {mHidden = hidden;}
 
     void setType(LLAssetType::EType type, LLInventoryType::EType inventory_type, U32 flags, bool is_link);
+    void setFavorite(bool is_favorite);
     LLAssetType::EType getAssetType() { return mType; }
     void setThumbnail(LLUUID id);
     void setGallery(LLInventoryGallery* gallery) { mGallery = gallery; }
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 0c35a7f695..d0747e7a8d 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -252,6 +252,20 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata)
     {
         ungroup_folder_items(mUUIDs.front());
     }
+    else if ("add_to_favorites" == action)
+    {
+        for (const LLUUID& id : mUUIDs)
+        {
+            set_favorite(id, true);
+        }
+    }
+    else if ("remove_from_favorites" == action)
+    {
+        for (const LLUUID& id : mUUIDs)
+        {
+            set_favorite(id, false);
+        }
+    }
     else if ("replaceoutfit" == action)
     {
         modify_outfit(false, mUUIDs.front(), &gInventory);
@@ -474,22 +488,7 @@ void LLInventoryGalleryContextMenu::onRename(const LLSD& notification, const LLS
 void LLInventoryGalleryContextMenu::fileUploadLocation(const LLSD& userdata)
 {
     const std::string param = userdata.asString();
-    if (param == "model")
-    {
-        gSavedPerAccountSettings.setString("ModelUploadFolder", mUUIDs.front().asString());
-    }
-    else if (param == "texture")
-    {
-        gSavedPerAccountSettings.setString("TextureUploadFolder", mUUIDs.front().asString());
-    }
-    else if (param == "sound")
-    {
-        gSavedPerAccountSettings.setString("SoundUploadFolder", mUUIDs.front().asString());
-    }
-    else if (param == "animation")
-    {
-        gSavedPerAccountSettings.setString("AnimationUploadFolder", mUUIDs.front().asString());
-    }
+    LLInventoryAction::fileUploadLocation(mUUIDs.front(), param);
 }
 
 bool LLInventoryGalleryContextMenu::canSetUploadLocation(const LLSD& userdata)
@@ -787,6 +786,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                 {
                     items.push_back(std::string("New Folder"));
                 }
+                items.push_back(std::string("upload_options"));
                 items.push_back(std::string("upload_def"));
             }
 
@@ -797,6 +797,18 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                 items.push_back(std::string("New Outfit"));
             }
 
+            if (!is_trash && !is_in_trash && gInventory.getRootFolderID() != selected_id)
+            {
+                if (get_is_favorite(obj))
+                {
+                    items.push_back(std::string("Remove from Favorites"));
+                }
+                else
+                {
+                    items.push_back(std::string("Add to Favorites"));
+                }
+            }
+
             items.push_back(std::string("Subfolder Separator"));
             if (!is_system_folder && !isRootFolder())
             {
@@ -842,6 +854,17 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
             if(is_agent_inventory)
             {
                 items.push_back(std::string("Cut"));
+                if (!is_in_trash)
+                {
+                    if (get_is_favorite(obj))
+                    {
+                        items.push_back(std::string("Remove from Favorites"));
+                    }
+                    else
+                    {
+                        items.push_back(std::string("Add to Favorites"));
+                    }
+                }
                 if (!is_link || !is_cof || !get_is_item_worn(selected_id))
                 {
                     items.push_back(std::string("Delete"));
@@ -980,6 +1003,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
             }
 
             disabled_items.push_back(std::string("New Folder"));
+            disabled_items.push_back(std::string("upload_options"));
             disabled_items.push_back(std::string("upload_def"));
             disabled_items.push_back(std::string("create_new"));
         }
@@ -1030,6 +1054,15 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                 disabled_items.push_back(std::string("Marketplace Move"));
             }
         }
+
+        if (get_is_favorite(obj))
+        {
+            items.push_back(std::string("Remove from Favorites"));
+        }
+        else if (is_agent_inventory)
+        {
+            items.push_back(std::string("Add to Favorites"));
+        }
     }
 
     hide_context_entries(*menu, items, disabled_items);
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
index 2e0669fc38..cfa37cc3ee 100644
--- a/indra/newview/llinventoryitemslist.cpp
+++ b/indra/newview/llinventoryitemslist.cpp
@@ -115,7 +115,7 @@ void LLInventoryItemsList::doIdle()
 {
     if (mRefreshState == REFRESH_COMPLETE) return;
 
-    if (isInVisibleChain() || mForceRefresh )
+    if (isInVisibleChain() || mForceRefresh || !getFilterSubString().empty())
     {
         refresh();
 
diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp
index e210975a5a..5fb5b0f23f 100644
--- a/indra/newview/llinventorylistitem.cpp
+++ b/indra/newview/llinventorylistitem.cpp
@@ -43,7 +43,19 @@
 
 static LLWidgetNameRegistry::StaticRegistrar sRegisterPanelInventoryListItemBaseParams(&typeid(LLPanelInventoryListItemBase::Params), "inventory_list_item");
 
-static const S32 WIDGET_SPACING = 3;
+constexpr S32 WIDGET_SPACING = 3;
+constexpr S32 FAVORITE_IMAGE_SIZE = 14;
+constexpr S32 FAVORITE_IMAGE_PAD = 3;
+
+bool get_is_item_favorite(const LLViewerInventoryItem* inv)
+{
+    if (inv->getIsLinkType())
+    {
+        LLInventoryObject* obj = gInventory.getObject(inv->getLinkedUUID());
+        return obj && obj->getIsFavorite();
+    }
+    return inv->getIsFavorite();
+}
 
 LLPanelInventoryListItemBase::Params::Params()
 :   default_style("default_style"),
@@ -75,19 +87,30 @@ void LLPanelInventoryListItemBase::draw()
         LLViewerInventoryItem* inv_item = getItem();
         if (inv_item)
         {
-            updateItem(inv_item->getName());
+            updateItem(inv_item->getName(), get_is_item_favorite(inv_item));
         }
         setNeedsRefresh(false);
     }
 
+    static LLUICachedControl<bool> draw_star("InventoryFavoritesUseStar", true);
+
+    LLRect local_rect = getLocalRect();
     if (mHovered && mHoverImage)
     {
-        mHoverImage->draw(getLocalRect());
+        mHoverImage->draw(local_rect);
+    }
+    else if (mIsFavorite && draw_star())
+    {
+
+        static LLPointer<LLUIImage> fav_img = LLRender2D::getInstance()->getUIImage("Inv_Favorite_Star_Full");
+        gl_draw_scaled_image(
+            local_rect.getWidth() - FAVORITE_IMAGE_SIZE - FAVORITE_IMAGE_PAD, FAVORITE_IMAGE_PAD,
+            FAVORITE_IMAGE_SIZE, FAVORITE_IMAGE_SIZE, fav_img->getImage());
     }
 
     if (mSelected && mSelectedImage)
     {
-        mSelectedImage->draw(getLocalRect());
+        mSelectedImage->draw(local_rect);
     }
 
     if (mSeparatorVisible && mSeparatorImage)
@@ -95,7 +118,7 @@ void LLPanelInventoryListItemBase::draw()
         // place under bottom of listitem, using image height
         // item_pad in list using the item should be >= image height
         // to avoid cropping of top of the next item.
-        LLRect separator_rect = getLocalRect();
+        LLRect separator_rect = local_rect;
         separator_rect.mTop = separator_rect.mBottom;
         separator_rect.mBottom -= mSeparatorImage->getHeight();
         F32 alpha = getCurrentTransparency();
@@ -107,9 +130,15 @@ void LLPanelInventoryListItemBase::draw()
 
 // virtual
 void LLPanelInventoryListItemBase::updateItem(const std::string& name,
+                                              bool favorite,
                                               EItemState item_state)
 {
     setIconImage(mIconImage);
+    if (mIsFavorite != favorite)
+    {
+        mIsFavorite = favorite;
+        reshapeMiddleWidgets();
+    }
     setTitle(name, mHighlightedText, item_state);
 }
 
@@ -164,7 +193,7 @@ bool LLPanelInventoryListItemBase::postBuild()
     if (inv_item)
     {
         mIconImage = LLInventoryIcon::getIcon(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), false);
-        updateItem(inv_item->getName());
+        updateItem(inv_item->getName(), get_is_item_favorite(inv_item));
     }
 
     setNeedsRefresh(true);
@@ -290,6 +319,7 @@ LLPanelInventoryListItemBase::LLPanelInventoryListItemBase(LLViewerInventoryItem
     mHovered(false),
     mSelected(false),
     mSeparatorVisible(false),
+    mIsFavorite(false),
     mHoverImage(params.hover_image),
     mSelectedImage(params.selected_image),
     mSeparatorImage(params.separator_image)
@@ -392,6 +422,16 @@ void LLPanelInventoryListItemBase::setTitle(const std::string& title,
     default:;
     }
 
+    if (mIsFavorite)
+    {
+        static LLUICachedControl<bool> use_color("InventoryFavoritesColorText", true);
+        if (use_color)
+        {
+            static const LLUIColor favorite_color = LLUIColorTable::instance().getColor("InventoryFavoriteColor", LLColor4::white);
+            style_params.color = favorite_color;
+        }
+    }
+
     LLTextUtil::textboxSetHighlightedVal(
         mTitleCtrl,
         style_params,
@@ -466,6 +506,10 @@ void LLPanelInventoryListItemBase::reshapeMiddleWidgets()
 
     S32 name_left = icon_rect.mRight + getWidgetSpacing();
     S32 name_right = getLocalRect().getWidth() - mRightWidgetsWidth - getWidgetSpacing();
+    if (mIsFavorite)
+    {
+        name_right -= FAVORITE_IMAGE_SIZE + FAVORITE_IMAGE_PAD;
+    }
     LLRect name_rect(mTitleCtrl->getRect());
     name_rect.set(name_left, name_rect.mTop, name_right, name_rect.mBottom);
     mTitleCtrl->setShape(name_rect);
diff --git a/indra/newview/llinventorylistitem.h b/indra/newview/llinventorylistitem.h
index 21540a380b..40a86001a4 100644
--- a/indra/newview/llinventorylistitem.h
+++ b/indra/newview/llinventorylistitem.h
@@ -167,6 +167,7 @@ protected:
      * Called after inventory item was updated, update panel widgets to reflect inventory changes.
      */
     virtual void updateItem(const std::string& name,
+                            bool favorite,
                             EItemState item_state = IS_DEFAULT);
 
     void setLeftWidgetsWidth(S32 width) { mLeftWidgetsWidth = width; }
@@ -222,8 +223,9 @@ private:
     LLUIImagePtr    mSelectedImage;
     LLUIImagePtr    mSeparatorImage;
 
-    bool            mSelected;
-    bool            mSeparatorVisible;
+    bool            mSelected = false;
+    bool            mSeparatorVisible = false;
+    bool            mIsFavorite = false; // note that any setter needs to update tittle
 
     std::string     mHighlightedText;
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b6ff31a7ed..bc33f29c33 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -78,7 +78,7 @@
 
 // Increment this if the inventory contents change in a non-backwards-compatible way.
 // For viewer 2, the addition of link items makes a pre-viewer-2 cache incorrect.
-const S32 LLInventoryModel::sCurrentInvCacheVersion = 3;
+const S32 LLInventoryModel::sCurrentInvCacheVersion = 4;
 bool LLInventoryModel::sFirstTimeInViewer2 = true;
 
 S32 LLInventoryModel::sPendingSystemFolders = 0;
@@ -2806,8 +2806,9 @@ bool LLInventoryModel::loadSkeleton(
                     cached_ids.insert(tcat->getUUID());
 
                     // At the moment download does not provide a thumbnail
-                    // uuid, use the one from cache
+                    // uuid or favorite, use values from cache
                     tcat->setThumbnailUUID(cat->getThumbnailUUID());
+                    tcat->setFavorite(cat->getIsFavorite());
                 }
             }
 
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index ac791e224e..ac22be9d5a 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -749,6 +749,13 @@ void LLInventoryCategoriesObserver::changed(U32 mask)
             cat_changed = true;
         }
 
+        bool is_favorite = category->getIsFavorite();
+        if (cat_data.mIsFavorite != is_favorite)
+        {
+            cat_data.mIsFavorite = is_favorite;
+            cat_changed = true;
+        }
+
         // If anything has changed above, fire the callback.
         if (cat_changed)
             cat_data.mCallback();
@@ -766,6 +773,7 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
     S32 version = LLViewerInventoryCategory::VERSION_UNKNOWN;
     S32 current_num_known_descendents = LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN;
     bool can_be_added = true;
+    bool favorite = false;
     LLUUID thumbnail_id;
 
     LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
@@ -779,6 +787,7 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
         // to a category have been made.
         version = category->getVersion();
         thumbnail_id = category->getThumbnailUUID();
+        favorite = category->getIsFavorite();
 
         LLInventoryModel::cat_array_t* cats;
         LLInventoryModel::item_array_t* items;
@@ -804,11 +813,11 @@ bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t
         if(init_name_hash)
         {
             digest_t item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
-            mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents,item_name_hash)));
+            mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, favorite, cb, version, current_num_known_descendents,item_name_hash)));
         }
         else
         {
-            mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents)));
+            mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, favorite, cb, version, current_num_known_descendents)));
         }
     }
 
@@ -821,25 +830,37 @@ void LLInventoryCategoriesObserver::removeCategory(const LLUUID& cat_id)
 }
 
 LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
-    const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents)
+    const LLUUID& cat_id,
+    const LLUUID& thumbnail_id,
+    bool is_favorite,
+    callback_t cb,
+    S32 version,
+    S32 num_descendents)
 
     : mCatID(cat_id)
     , mCallback(cb)
     , mVersion(version)
     , mDescendentsCount(num_descendents)
     , mThumbnailId(thumbnail_id)
+    , mIsFavorite(is_favorite)
     , mIsNameHashInitialized(false)
 {
 }
 
 LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
-    const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents, const digest_t& name_hash)
+    const LLUUID& cat_id,
+    const LLUUID& thumbnail_id,
+    bool is_favorite,
+    callback_t cb, S32 version,
+    S32 num_descendents,
+    const digest_t& name_hash)
 
     : mCatID(cat_id)
     , mCallback(cb)
     , mVersion(version)
     , mDescendentsCount(num_descendents)
     , mThumbnailId(thumbnail_id)
+    , mIsFavorite(is_favorite)
     , mIsNameHashInitialized(true)
     , mItemNameHash(name_hash)
 {
diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h
index 950b02d3cf..12d6c44521 100644
--- a/indra/newview/llinventoryobserver.h
+++ b/indra/newview/llinventoryobserver.h
@@ -60,6 +60,7 @@ public:
         CREATE          = 512,  // With ADD, item has just been created.
         // unfortunately a particular message is still associated with some unique semantics.
         UPDATE_CREATE   = 1024,  // With ADD, item added via UpdateCreateInventoryItem
+        UPDATE_FAVORITE = 2048,  // With ADD, item added via UpdateCreateInventoryItem
         ALL             = 0xffffffff
     };
     LLInventoryObserver();
@@ -276,12 +277,26 @@ protected:
     typedef LLUUID digest_t; // To clarify the actual usage of this "UUID"
     struct LLCategoryData
     {
-        LLCategoryData(const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents);
-        LLCategoryData(const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents, const digest_t& name_hash);
+        LLCategoryData(
+            const LLUUID& cat_id,
+            const LLUUID& thumbnail_id,
+            bool is_favorite,
+            callback_t cb,
+            S32 version,
+            S32 num_descendents);
+        LLCategoryData(
+            const LLUUID& cat_id,
+            const LLUUID& thumbnail_id,
+            bool is_favorite,
+            callback_t cb,
+            S32 version,
+            S32 num_descendents,
+            const digest_t& name_hash);
         callback_t  mCallback;
         S32         mVersion;
         S32         mDescendentsCount;
         digest_t    mItemNameHash;
+        bool        mIsFavorite;
         bool        mIsNameHashInitialized;
         LLUUID      mCatID;
         LLUUID      mThumbnailId;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 1795de727d..1f6da85d22 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -55,11 +55,13 @@
 #include "llviewerfoldertype.h"
 #include "llvoavatarself.h"
 
+class LLInventoryFavoritesItemsPanel;
 class LLInventoryRecentItemsPanel;
 class LLAssetFilteredInventoryPanel;
 
 static LLDefaultChildRegistry::Register<LLInventoryPanel> r("inventory_panel");
 static LLDefaultChildRegistry::Register<LLInventoryRecentItemsPanel> t_recent_inventory_panel("recent_inventory_panel");
+static LLDefaultChildRegistry::Register<LLInventoryFavoritesItemsPanel> t_favorites_inventory_panel("favorites_inventory_panel");
 static LLDefaultChildRegistry::Register<LLAssetFilteredInventoryPanel> t_asset_filtered_inv_panel("asset_filtered_inv_panel");
 
 const std::string LLInventoryPanel::DEFAULT_SORT_ORDER = std::string("InventorySortOrder");
@@ -623,6 +625,19 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
         }
     }
 
+    if (mask & LLInventoryObserver::UPDATE_FAVORITE)
+    {
+        if (view_item)
+        {
+            view_item->refresh();
+            LLFolderViewFolder* parent = view_item->getParentFolder();
+            if (parent)
+            {
+                parent->updateHasFavorites(get_is_favorite(model_item));
+            }
+        }
+    }
+
     // We don't typically care which of these masks the item is actually flagged with, since the masks
     // may not be accurate (e.g. in the main inventory panel, I move an item from My Inventory into
     // Landmarks; this is a STRUCTURE change for that panel but is an ADD change for the Landmarks
@@ -651,6 +666,16 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
                 setSelection(item_id, false);
             }
             updateFolderLabel(model_item->getParentUUID());
+
+            if (get_is_favorite(model_item))
+            {
+                LLFolderViewFolder* new_parent = getFolderByID(model_item->getParentUUID());
+                if (new_parent)
+                {
+                    new_parent->updateHasFavorites(true);
+                }
+            }
+
         }
 
         //////////////////////////////
@@ -664,9 +689,11 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
             {
                 LLFolderViewModelItem* old_parent_vmi = old_parent->getViewModelItem();
                 LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(old_parent_vmi);
-                LLFolderViewFolder* new_parent =   (LLFolderViewFolder*)getItemByID(model_item->getParentUUID());
-                // Item has been moved.
-                if (old_parent != new_parent)
+                LLFolderViewFolder* new_parent = getFolderByID(model_item->getParentUUID());
+
+                if (old_parent != new_parent // Item has been moved.
+                    && (new_parent != NULL || !isInRootContent(item_id, view_item)) // item is not or shouldn't be in root content
+                    )
                 {
                     if (new_parent != NULL)
                     {
@@ -701,9 +728,21 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
                     {
                         old_parent_vmi->dirtyDescendantsFilter();
                     }
+
+                    if (view_item->isFavorite())
+                    {
+                        if (old_parent)
+                        {
+                        old_parent->updateHasFavorites(false); // favorite was removed
+                        }
+                        if (new_parent)
+                        {
+                        new_parent->updateHasFavorites(true); // favorite was added
+                    }
                 }
             }
         }
+        }
 
         //////////////////////////////
         // REMOVE Operation
@@ -726,6 +765,10 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
                         updateFolderLabel(viewmodel_folder->getUUID());
                     }
                 }
+                if (view_item->isFavorite())
+                {
+                    parent->updateHasFavorites(false); // favorite was removed
+                }
             }
         }
     }
@@ -843,7 +886,23 @@ void LLInventoryPanel::idle(void* user_data)
 
     bool in_visible_chain = panel->isInVisibleChain();
 
-    if (!panel->mBuildViewsQueue.empty())
+    if (!panel->mBuildRootQueue.empty())
+    {
+        const F64 max_time = in_visible_chain ? 0.006f : 0.001f; // 6 ms
+        F64 curent_time = LLTimer::getTotalSeconds();
+        panel->mBuildViewsEndTime = curent_time + max_time;
+
+        while (curent_time < panel->mBuildViewsEndTime
+            && !panel->mBuildRootQueue.empty())
+        {
+            LLUUID item_id = panel->mBuildRootQueue.back();
+            panel->mBuildRootQueue.pop_back();
+            panel->findAndInitRootContent(item_id);
+
+            curent_time = LLTimer::getTotalSeconds();
+        }
+    }
+    else if (!panel->mBuildViewsQueue.empty())
     {
         const F64 max_time = in_visible_chain ? 0.006f : 0.001f; // 6 ms
         F64 curent_time = LLTimer::getTotalSeconds();
@@ -925,20 +984,9 @@ void LLInventoryPanel::initializeViews(F64 max_time)
     mBuildViewsEndTime = curent_time + max_time;
 
     // init everything
-    LLUUID root_id = getRootFolderID();
-    if (root_id.notNull())
-    {
-        buildNewViews(getRootFolderID());
-    }
-    else
-    {
-        // Default case: always add "My Inventory" root first, "Library" root second
-        // If we run out of time, this still should create root folders
-        buildNewViews(gInventory.getRootFolderID());        // My Inventory
-        buildNewViews(gInventory.getLibraryRootFolderID()); // Library
-    }
+    initRootContent();
 
-    if (mBuildViewsQueue.empty())
+    if (mBuildViewsQueue.empty() && mBuildRootQueue.empty())
     {
         mViewsInitialized = VIEWS_INITIALIZED;
     }
@@ -969,6 +1017,22 @@ void LLInventoryPanel::initializeViews(F64 max_time)
     }
 }
 
+void LLInventoryPanel::initRootContent()
+{
+    LLUUID root_id = getRootFolderID();
+    if (root_id.notNull())
+    {
+        buildNewViews(getRootFolderID());
+    }
+    else
+    {
+        // Default case: always add "My Inventory" root first, "Library" root second
+        // If we run out of time, this still should create root folders
+        buildNewViews(gInventory.getRootFolderID());        // My Inventory
+        buildNewViews(gInventory.getLibraryRootFolderID()); // Library
+    }
+}
+
 
 LLFolderViewFolder * LLInventoryPanel::createFolderViewFolder(LLInvFVBridge * bridge, bool allow_drop)
 {
@@ -1740,26 +1804,8 @@ bool LLInventoryPanel::beginIMSession()
 void LLInventoryPanel::fileUploadLocation(const LLSD& userdata)
 {
     const std::string param = userdata.asString();
-    if (param == "model")
-    {
-        gSavedPerAccountSettings.setString("ModelUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
-    }
-    else if (param == "texture")
-    {
-        gSavedPerAccountSettings.setString("TextureUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
-    }
-    else if (param == "sound")
-    {
-        gSavedPerAccountSettings.setString("SoundUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
-    }
-    else if (param == "animation")
-    {
-        gSavedPerAccountSettings.setString("AnimationUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
-    }
-    else if (param == "pbr_material")
-    {
-        gSavedPerAccountSettings.setString("PBRUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
-    }
+    const LLUUID dest = LLFolderBridge::sSelf.get()->getUUID();
+    LLInventoryAction::fileUploadLocation(dest, param);
 }
 
 void LLInventoryPanel::setFavoriteFolder()
@@ -2212,6 +2258,273 @@ LLInventoryRecentItemsPanel::LLInventoryRecentItemsPanel( const Params& params)
     mInvFVBridgeBuilder = &RECENT_ITEMS_BUILDER;
 }
 
+/************************************************************************/
+/* Favorites Inventory Panel related class                              */
+/************************************************************************/
+static const LLFavoritesInventoryBridgeBuilder FAVORITES_BUILDER;
+class LLInventoryFavoritesItemsPanel : public LLInventoryPanel
+{
+public:
+    struct Params : public LLInitParam::Block<Params, LLInventoryPanel::Params>
+    {};
+
+    void initFromParams(const Params& p)
+    {
+        LLInventoryPanel::initFromParams(p);
+        // turn off trash
+        getFilter().setFilterCategoryTypes(getFilter().getFilterCategoryTypes() | (1ULL << LLFolderType::FT_TRASH));
+        getFilter().setFilterNoTrashFolder();
+        // turn off marketplace for favorites
+        getFilter().setFilterNoMarketplaceFolder();
+    }
+
+    void removeItemID(const LLUUID& id) override;
+    bool isInRootContent(const LLUUID& id, LLFolderViewItem* view_item) override;
+
+protected:
+    LLInventoryFavoritesItemsPanel(const Params&);
+    friend class LLUICtrlFactory;
+
+    void findAndInitRootContent(const LLUUID& folder_id) override;
+    void initRootContent() override;
+
+    // removeFavorite removes item from root, does not readd favorited children if present
+    bool removeFavorite(const LLUUID& id, const LLInventoryObject* model_item);
+    void itemChanged(const LLUUID& item_id, U32 mask, const LLInventoryObject* model_item) override;
+
+    std::set<LLUUID> mRootContentIDs;
+};
+
+LLInventoryFavoritesItemsPanel::LLInventoryFavoritesItemsPanel(const Params& params)
+    : LLInventoryPanel(params)
+{
+    // replace bridge builder to have necessary View bridges.
+    mInvFVBridgeBuilder = &FAVORITES_BUILDER;
+}
+
+void LLInventoryFavoritesItemsPanel::removeItemID(const LLUUID& id)
+{
+    std::set<LLUUID>::iterator found = mRootContentIDs.find(id);
+    if (found != mRootContentIDs.end())
+    {
+        mRootContentIDs.erase(found);
+        // check content for favorites
+        mBuildRootQueue.emplace_back(id);
+    }
+
+    LLInventoryPanel::removeItemID(id);
+}
+
+bool LLInventoryFavoritesItemsPanel::isInRootContent(const LLUUID& id, LLFolderViewItem* view_item)
+{
+    if (!view_item->isFavorite())
+    {
+        return false;
+    }
+
+    std::set<LLUUID>::iterator found = mRootContentIDs.find(id);
+    return found != mRootContentIDs.end();
+}
+
+void LLInventoryFavoritesItemsPanel::findAndInitRootContent(const LLUUID& id)
+{
+    F64 curent_time = LLTimer::getTotalSeconds();
+    if (mBuildViewsEndTime < curent_time)
+    {
+        mBuildRootQueue.emplace_back(id);
+        return;
+    }
+    LLViewerInventoryCategory::cat_array_t* categories;
+    LLViewerInventoryItem::item_array_t* items;
+    mInventory->lockDirectDescendentArrays(id, categories, items);
+
+    if (categories)
+    {
+        S32 count = static_cast<S32>(categories->size());
+        for (S32 i = 0; i < count; ++i)
+        {
+            LLViewerInventoryCategory* cat = categories->at(i);
+            if (cat->getPreferredType() == LLFolderType::FT_TRASH)
+            {
+                continue;
+            }
+            else if (cat->getIsFavorite())
+            {
+                LLFolderViewItem* folder_view_item = getItemByID(cat->getUUID());
+                if (!folder_view_item)
+                {
+                    const LLUUID& parent_id = cat->getParentUUID();
+                    mRootContentIDs.emplace(cat->getUUID());
+
+                    buildViewsTree(cat->getUUID(), parent_id, cat, folder_view_item, mFolderRoot.get(), BUILD_TIMELIMIT);
+                }
+            }
+            else
+            {
+                findAndInitRootContent(cat->getUUID());
+            }
+        }
+    }
+
+    if (items)
+    {
+        S32 count = static_cast<S32>(items->size());
+        for (S32 i = 0; i < count; ++i)
+        {
+            LLViewerInventoryItem* item = items->at(i);
+            const LLUUID item_id = item->getUUID();
+            if (item->getIsFavorite() && typedViewsFilter(item_id, item))
+            {
+                LLFolderViewItem* folder_view_item = getItemByID(id);
+                if (!folder_view_item)
+                {
+                    const LLUUID& parent_id = item->getParentUUID();
+                    mRootContentIDs.emplace(item_id);
+
+                    buildViewsTree(item_id, parent_id, item, folder_view_item, mFolderRoot.get(), BUILD_TIMELIMIT);
+                }
+            }
+        }
+    }
+
+    mInventory->unlockDirectDescendentArrays(id);
+}
+
+void LLInventoryFavoritesItemsPanel::initRootContent()
+{
+    findAndInitRootContent(gInventory.getRootFolderID()); // My Inventory
+}
+
+bool LLInventoryFavoritesItemsPanel::removeFavorite(const LLUUID& id, const LLInventoryObject* model_item)
+{
+    std::set<LLUUID>::iterator found = mRootContentIDs.find(id);
+    if (found == mRootContentIDs.end())
+    {
+        return false;
+    }
+
+    mRootContentIDs.erase(found);
+
+    // This item is in root's content, remove item's UI.
+    LLFolderViewItem* view_item = getItemByID(id);
+    if (view_item)
+    {
+        LLFolderViewFolder* parent = view_item->getParentFolder();
+        LLFolderViewModelItemInventory* viewmodel_item = static_cast<LLFolderViewModelItemInventory*>(view_item->getViewModelItem());
+        if (viewmodel_item)
+        {
+            removeItemID(viewmodel_item->getUUID());
+        }
+        view_item->destroyView();
+        if (parent)
+        {
+            parent->getViewModelItem()->dirtyDescendantsFilter();
+            LLFolderViewModelItemInventory* viewmodel_folder = static_cast<LLFolderViewModelItemInventory*>(parent->getViewModelItem());
+            if (viewmodel_folder)
+            {
+                updateFolderLabel(viewmodel_folder->getUUID());
+            }
+            if (view_item->isFavorite())
+            {
+                parent->updateHasFavorites(false); // favorite was removed
+            }
+        }
+    }
+
+    return true;
+}
+
+void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, const LLInventoryObject* model_item)
+{
+    if (!model_item && !getItemByID(id))
+    {
+        // remove operation, but item is not in panel already
+        return;
+    }
+
+    bool handled = false;
+
+    if (mask & (LLInventoryObserver::UPDATE_FAVORITE |
+        LLInventoryObserver::STRUCTURE |
+        LLInventoryObserver::ADD |
+        LLInventoryObserver::REMOVE))
+    {
+        // specifically exlude links and not get_is_favorite(model_item)
+        if (model_item && model_item->getIsFavorite())
+        {
+            LLFolderViewItem* view_item = getItemByID(id);
+            if (!view_item)
+            {
+                const LLViewerInventoryCategory* cat = dynamic_cast<const LLViewerInventoryCategory*>(model_item);
+                if (cat)
+                {
+                    // New favorite folder
+                    if (cat->getPreferredType() != LLFolderType::FT_TRASH)
+                    {
+                        // If any descendants were in the list, remove them
+                        // Todo: Consider implementing and checking hasFavorites to save on search
+                        LLFavoritesCollector is_favorite;
+                        LLInventoryModel::cat_array_t cat_array;
+                        LLInventoryModel::item_array_t item_array;
+                        gInventory.collectDescendentsIf(id, cat_array, item_array, false, is_favorite);
+                        for (LLInventoryModel::cat_array_t::const_iterator it = cat_array.begin(); it != cat_array.end(); ++it)
+                        {
+                            removeFavorite((*it)->getUUID(), *it);
+                        }
+                        for (LLInventoryModel::item_array_t::const_iterator it = item_array.begin(); it != item_array.end(); ++it)
+                        {
+                            removeFavorite((*it)->getUUID(), *it);
+                        }
+
+                        LLFolderViewItem* folder_view_item = getItemByID(cat->getUUID());
+                        if (!folder_view_item)
+                        {
+                            const LLUUID& parent_id = cat->getParentUUID();
+                            mRootContentIDs.emplace(cat->getUUID());
+
+                            buildViewsTree(cat->getUUID(), parent_id, cat, folder_view_item, mFolderRoot.get(), BUILD_ONE_FOLDER);
+                        }
+                    }
+                }
+                else
+                {
+                    // New favorite item
+                    if (model_item->getIsFavorite() && typedViewsFilter(id, model_item))
+                    {
+                        const LLUUID& parent_id = model_item->getParentUUID();
+                        mRootContentIDs.emplace(id);
+
+                        buildViewsTree(id, parent_id, model_item, NULL, mFolderRoot.get(), BUILD_ONE_FOLDER);
+                    }
+                }
+                handled = true;
+            }
+        }
+        else
+        {
+            handled = removeFavorite(id, model_item);
+            if (handled)
+            {
+                const LLViewerInventoryCategory* cat = dynamic_cast<const LLViewerInventoryCategory*>(model_item);
+                // Todo: Consider implementing and checking hasFavorites to save on search
+                if (cat)
+                {
+                    // re-add any favorited children
+                    mBuildRootQueue.emplace_back(id);
+                }
+            }
+        }
+    }
+
+    if (!handled)
+    {
+        LLInventoryPanel::itemChanged(id, mask, model_item);
+    }
+}
+/************************************************************************/
+/* LLInventorySingleFolderPanel                                         */
+/************************************************************************/
+
 static LLDefaultChildRegistry::Register<LLInventorySingleFolderPanel> t_single_folder_inventory_panel("single_folder_inventory_panel");
 
 LLInventorySingleFolderPanel::LLInventorySingleFolderPanel(const Params& params)
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index ab17196e5f..b7fef98413 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -252,7 +252,8 @@ public:
                                                     bool reset_filter = false);
     static void setSFViewAndOpenFolder(const LLInventoryPanel* panel, const LLUUID& folder_id);
     void addItemID(const LLUUID& id, LLFolderViewItem* itemp);
-    void removeItemID(const LLUUID& id);
+    virtual void removeItemID(const LLUUID& id);
+    virtual bool isInRootContent(const LLUUID& id, LLFolderViewItem* view_item) { return false; }
     LLFolderViewItem* getItemByID(const LLUUID& id);
     LLFolderViewFolder* getFolderByID(const LLUUID& id);
     void setSelectionByID(const LLUUID& obj_id, bool take_keyboard_focus);
@@ -335,6 +336,8 @@ public:
 protected:
     // Builds the UI.  Call this once the inventory is usable.
     void                initializeViews(F64 max_time);
+    virtual void        initRootContent();
+    virtual void        findAndInitRootContent(const LLUUID& root_id) {};
 
     // Specific inventory colors
     static bool                 sColorSetInitialized;
@@ -372,7 +375,7 @@ protected:
     virtual LLFolderViewItem*   createFolderViewItem(LLInvFVBridge * bridge);
 
     boost::function<void(const std::deque<LLFolderViewItem*>& items, bool user_action)> mSelectionCallback;
-private:
+
     // buildViewsTree does not include some checks and is meant
     // for recursive use, use buildNewViews() for first call
     LLFolderViewItem*           buildViewsTree(const LLUUID& id,
@@ -395,6 +398,8 @@ private:
     EViewsInitializationState   mViewsInitialized; // Whether views have been generated
     F64                         mBuildViewsEndTime; // Stop building views past this timestamp
     std::deque<LLUUID>          mBuildViewsQueue;
+    std::deque<LLUUID>          mBuildRootQueue;
+
 };
 
 
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 28160177f6..3bf50c8e65 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -1414,7 +1414,7 @@ bool LLMaterialEditor::saveIfNeeded()
         }
 
         std::string res_desc = buildMaterialDescription();
-        createInventoryItem(buffer, mMaterialName, res_desc, local_permissions);
+        createInventoryItem(buffer, mMaterialName, res_desc, local_permissions, mUploadFolder);
 
         // We do not update floater with uploaded asset yet, so just close it.
         closeFloater();
@@ -1584,12 +1584,12 @@ private:
     std::string mNewName;
 };
 
-void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& permissions)
+void LLMaterialEditor::createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& permissions, const LLUUID& upload_folder)
 {
     // gen a new uuid for this asset
     LLTransactionID tid;
     tid.generate();     // timestamp-based randomization + uniquification
-    LLUUID parent = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_MATERIAL);
+    LLUUID parent = upload_folder.isNull() ? gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_MATERIAL) : upload_folder;
     const U8 subtype = NO_INV_SUBTYPE;  // TODO maybe use AT_SETTINGS and LLSettingsType::ST_MATERIAL ?
 
     LLPointer<LLObjectsMaterialItemCallback> cb = new LLObjectsMaterialItemCallback(permissions, buffer, name);
@@ -1903,7 +1903,11 @@ static void pack_textures(
     }
 }
 
-void LLMaterialEditor::uploadMaterialFromModel(const std::string& filename, tinygltf::Model& model_in, S32 index)
+void LLMaterialEditor::uploadMaterialFromModel(
+    const std::string& filename,
+    tinygltf::Model& model_in,
+    S32 index,
+    const LLUUID& dest)
 {
     if (index < 0 || !LLMaterialEditor::capabilitiesAvailable())
     {
@@ -1926,12 +1930,13 @@ void LLMaterialEditor::uploadMaterialFromModel(const std::string& filename, tiny
     // This uses 'filename' to make sure multiple bulk uploads work
     // instead of fighting for a single instance.
     LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::getInstance("material_editor", LLSD().with("filename", filename).with("index", LLSD::Integer(index)));
+    me->mUploadFolder = dest;
     me->loadMaterial(model_in, filename, index, false);
     me->saveIfNeeded();
 }
 
 
-void LLMaterialEditor::loadMaterialFromFile(const std::string& filename, S32 index)
+void LLMaterialEditor::loadMaterialFromFile(const std::string& filename, S32 index, const LLUUID& dest_folder)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_UI;
 
@@ -2431,17 +2436,17 @@ void LLMaterialEditor::onSaveObjectsMaterialAsMsgCallback(const LLSD& notificati
         return;
     }
 
-    createInventoryItem(str.str(), new_name, std::string(), permissions);
+    createInventoryItem(str.str(), new_name, std::string(), permissions, LLUUID::null);
 }
 
-const void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter type, bool allow_2k);
+void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter type, bool allow_2k, const LLUUID& dest);
 
 void LLMaterialEditor::loadMaterial(const tinygltf::Model &model_in, const std::string &filename, S32 index, bool open_floater)
 {
     if (index == model_in.materials.size())
     {
         // bulk upload all the things
-        upload_bulk({ filename }, LLFilePicker::FFLOAD_MATERIAL, true);
+        upload_bulk({ filename }, LLFilePicker::FFLOAD_MATERIAL, true, LLUUID::null);
         return;
     }
 
@@ -2848,10 +2853,10 @@ void LLMaterialEditor::setFromGltfMetaData(const std::string& filename, const ti
     }
 }
 
-void LLMaterialEditor::importMaterial()
+void LLMaterialEditor::importMaterial(const LLUUID dest_folder)
 {
     LLFilePickerReplyThread::startPicker(
-        [](const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter load_filter, LLFilePicker::ESaveFilter save_filter)
+        [dest_folder](const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter load_filter, LLFilePicker::ESaveFilter save_filter)
             {
                 if (LLAppViewer::instance()->quitRequested())
                 {
@@ -2861,7 +2866,7 @@ void LLMaterialEditor::importMaterial()
                 {
                     if (filenames.size() > 0)
                     {
-                        LLMaterialEditor::loadMaterialFromFile(filenames[0], -1);
+                        LLMaterialEditor::loadMaterialFromFile(filenames[0], -1, dest_folder);
                     }
                 }
                 catch (std::bad_alloc&)
@@ -3549,6 +3554,7 @@ void LLMaterialEditor::saveTexture(LLImageJ2C* img, const std::string& name, con
         LLFloaterPerms::getGroupPerms("Uploads"),
         LLFloaterPerms::getEveryonePerms("Uploads"),
         expected_upload_cost,
+        mUploadFolder,
         false,
         cb,
         failed_upload));
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index 232467460e..1abdd7f84c 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -94,7 +94,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     void setFromGltfMetaData(const std::string& filename, const  tinygltf::Model& model, S32 index);
 
     // open a file dialog and select a gltf/glb file for import
-    static void importMaterial();
+    static void importMaterial(const LLUUID dest_folder = LLUUID::null);
 
     // for live preview, apply current material to currently selected object
     void applyToSelection();
@@ -105,8 +105,11 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
     void loadAsset() override;
     // @index if -1 and file contains more than one material,
     // will promt to select specific one
-    static void uploadMaterialFromModel(const std::string& filename, tinygltf::Model& model, S32 index);
-    static void loadMaterialFromFile(const std::string& filename, S32 index = -1);
+    static void uploadMaterialFromModel(const std::string& filename,
+                                        tinygltf::Model& model,
+                                        S32 index,
+                                        const LLUUID& dest_folder_id = LLUUID::null);
+    static void loadMaterialFromFile(const std::string& filename, S32 index = -1, const LLUUID& dest_folder = LLUUID::null);
 
     void onSelectionChanged(); // live overrides selection changes
 
@@ -134,8 +137,6 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
 
     void onClickSave();
 
-    void getGLTFModel(tinygltf::Model& model);
-
     std::string getEncodedAsset();
 
     bool decodeAsset(const std::vector<char>& buffer);
@@ -239,7 +240,7 @@ private:
     static void saveObjectsMaterialAs(const LLGLTFMaterial *render_material, const LLLocalGLTFMaterial *local_material, const LLPermissions& permissions, const LLUUID& object_id /* = LLUUID::null */, const LLUUID& item /* = LLUUID::null */);
 
     static bool updateInventoryItem(const std::string &buffer, const LLUUID &item_id, const LLUUID &task_id);
-    static void createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& permissions);
+    static void createInventoryItem(const std::string &buffer, const std::string &name, const std::string &desc, const LLPermissions& permissions, const LLUUID& upload_folder);
 
     void setFromGLTFMaterial(LLGLTFMaterial* mat);
     bool setFromSelection();
@@ -249,6 +250,7 @@ private:
     friend class LLMaterialFilePicker;
 
     LLUUID mAssetID;
+    LLUUID mUploadFolder;
 
     LLTextureCtrl* mBaseColorTextureCtrl;
     LLTextureCtrl* mMetallicTextureCtrl;
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index a8c6f69425..126579d005 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -756,8 +756,12 @@ public:
 };
 
 
-void log_upload_error(LLCore::HttpStatus status, const LLSD& content,
-                      const char * const stage, const std::string & model_name)
+void log_upload_error(
+    LLCore::HttpStatus status,
+    const LLSD& content,
+    const char * const stage,
+    const std::string & model_name,
+    const std::vector<std::string> & texture_filenames)
 {
     // Add notification popup.
     LLSD args;
@@ -815,6 +819,20 @@ void log_upload_error(LLCore::HttpStatus status, const LLSD& content,
                 error_num++;
             }
         }
+
+        if (err.has("TextureIndex"))
+        {
+            S32 texture_index = err["TextureIndex"].asInteger();
+            if (texture_index < texture_filenames.size())
+            {
+                args["MESSAGE"] = message + "\n" + texture_filenames[texture_index];
+            }
+            else
+            {
+                llassert(false); // figure out why or how texture wasn't in the list
+                args["MESSAGE"] = message + llformat("\nTexture index: %d", texture_index);
+            }
+        }
     }
     else
     {
@@ -2472,7 +2490,7 @@ EMeshProcessingResult LLMeshRepoThread::physicsShapeReceived(const LLUUID& mesh_
 
 LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list& data, LLVector3& scale, bool upload_textures,
                                        bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position,
-                                       const std::string & upload_url, bool do_upload,
+                                       const std::string & upload_url, LLUUID destination_folder_id, bool do_upload,
                                        LLHandle<LLWholeModelFeeObserver> fee_observer,
                                        LLHandle<LLWholeModelUploadObserver> upload_observer)
   : LLThread("mesh upload"),
@@ -2480,6 +2498,7 @@ LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list& data,
     mDiscarded(false),
     mDoUpload(do_upload),
     mWholeModelUploadURL(upload_url),
+    mDestinationFolderId(destination_folder_id),
     mFeeObserverHandle(fee_observer),
     mUploadObserverHandle(upload_observer)
 {
@@ -2596,13 +2615,21 @@ LLSD llsd_from_file(std::string filename)
     return result;
 }
 
-void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
+void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, std::vector<std::string>& texture_list_dest, bool include_textures)
 {
     LLSD result;
 
     LLSD res;
+    if (mDestinationFolderId.isNull())
+    {
     result["folder_id"] = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_OBJECT);
     result["texture_folder_id"] = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_TEXTURE);
+    }
+    else
+    {
+        result["folder_id"] = mDestinationFolderId;
+        result["texture_folder_id"] = mDestinationFolderId;
+    }
     result["asset_type"] = "mesh";
     result["inventory_type"] = "object";
     result["description"] = "(No Description)";
@@ -2745,7 +2772,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
                         LLPointer<LLImageJ2C> upload_file =
                             LLViewerTextureList::convertToUploadFile(texture->getSavedRawImage());
 
-                        if (!upload_file.isNull() && upload_file->getDataSize())
+                        if (!upload_file.isNull() && upload_file->getDataSize() && !upload_file->isBufferInvalid())
                         {
                             texture_str.write((const char*) upload_file->getData(), upload_file->getDataSize());
                         }
@@ -2759,6 +2786,8 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
                     texture_index[texture] = texture_num;
                     std::string str = texture_str.str();
                     res["texture_list"][texture_num] = LLSD::Binary(str.begin(),str.end());
+                    // store indexes for error handling;
+                    texture_list_dest.push_back(material.mDiffuseMapFilename);
                     texture_num++;
                 }
 
@@ -3023,7 +3052,8 @@ void LLMeshUploadThread::doWholeModelUpload()
         LL_DEBUGS(LOG_MESH) << "Hull generation completed." << LL_ENDL;
 
         mModelData = LLSD::emptyMap();
-        wholeModelToLLSD(mModelData, true);
+        mTextureFiles.clear();
+        wholeModelToLLSD(mModelData, mTextureFiles, true);
         LLSD body = mModelData["asset_resources"];
 
         dump_llsd_to_file(body, make_dump_name("whole_model_body_", dump_num));
@@ -3076,7 +3106,8 @@ void LLMeshUploadThread::requestWholeModelFee()
     generateHulls();
 
     mModelData = LLSD::emptyMap();
-    wholeModelToLLSD(mModelData, false);
+    mTextureFiles.clear();
+    wholeModelToLLSD(mModelData, mTextureFiles, false);
     dump_llsd_to_file(mModelData, make_dump_name("whole_model_fee_request_", dump_num));
     LLCore::HttpHandle handle = LLCoreHttpUtil::requestPostWithLLSD(mHttpRequest,
                                                                     mHttpPolicyClass,
@@ -3142,7 +3173,7 @@ void LLMeshUploadThread::onCompleted(LLCore::HttpHandle handle, LLCore::HttpResp
             body["error"] = LLSD::emptyMap();
             body["error"]["message"] = reason;
             body["error"]["identifier"] = "NetworkError";       // from asset-upload/upload_util.py
-            log_upload_error(status, body, "upload", mModelData["name"].asString());
+            log_upload_error(status, body, "upload", mModelData["name"].asString(), mTextureFiles);
 
             if (observer)
             {
@@ -3177,7 +3208,7 @@ void LLMeshUploadThread::onCompleted(LLCore::HttpHandle handle, LLCore::HttpResp
             else
             {
                 LL_WARNS(LOG_MESH) << "Upload failed.  Not in expected 'complete' state." << LL_ENDL;
-                log_upload_error(status, body, "upload", mModelData["name"].asString());
+                log_upload_error(status, body, "upload", mModelData["name"].asString(), mTextureFiles);
 
                 if (observer)
                 {
@@ -3202,7 +3233,7 @@ void LLMeshUploadThread::onCompleted(LLCore::HttpHandle handle, LLCore::HttpResp
             body["error"] = LLSD::emptyMap();
             body["error"]["message"] = reason;
             body["error"]["identifier"] = "NetworkError";       // from asset-upload/upload_util.py
-            log_upload_error(status, body, "fee", mModelData["name"].asString());
+            log_upload_error(status, body, "fee", mModelData["name"].asString(), mTextureFiles);
 
             if (observer)
             {
@@ -3235,7 +3266,7 @@ void LLMeshUploadThread::onCompleted(LLCore::HttpHandle handle, LLCore::HttpResp
             else
             {
                 LL_WARNS(LOG_MESH) << "Fee request failed.  Not in expected 'upload' state." << LL_ENDL;
-                log_upload_error(status, body, "fee", mModelData["name"].asString());
+                log_upload_error(status, body, "fee", mModelData["name"].asString(), mTextureFiles);
 
                 if (observer)
                 {
@@ -4973,12 +5004,12 @@ bool LLMeshRepoThread::hasHeader(const LLUUID& mesh_id) const
 
 void LLMeshRepository::uploadModel(std::vector<LLModelInstance>& data, LLVector3& scale, bool upload_textures,
                                    bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position,
-                                   std::string upload_url, bool do_upload,
+                                   std::string upload_url, const LLUUID& destination_folder_id, bool do_upload,
                                    LLHandle<LLWholeModelFeeObserver> fee_observer, LLHandle<LLWholeModelUploadObserver> upload_observer)
 {
     LLMeshUploadThread* thread = new LLMeshUploadThread(data, scale, upload_textures,
                                                         upload_skin, upload_joints, lock_scale_if_joint_position,
-                                                        upload_url, do_upload, fee_observer, upload_observer);
+                                                        upload_url, destination_folder_id, do_upload, fee_observer, upload_observer);
     mUploadWaitList.push_back(thread);
 }
 
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 0d9da32e27..2ac90f7b10 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -637,10 +637,13 @@ public:
     LLHost          mHost;
     std::string     mWholeModelFeeCapability;
     std::string     mWholeModelUploadURL;
+    LLUUID          mDestinationFolderId;
 
     LLMeshUploadThread(instance_list& data, LLVector3& scale, bool upload_textures,
                        bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position,
-                       const std::string & upload_url, bool do_upload = true,
+                       const std::string & upload_url,
+                       const LLUUID destination_folder_id = LLUUID::null,
+                       bool do_upload = true,
                        LLHandle<LLWholeModelFeeObserver> fee_observer = (LLHandle<LLWholeModelFeeObserver>()),
                        LLHandle<LLWholeModelUploadObserver> upload_observer = (LLHandle<LLWholeModelUploadObserver>()));
     ~LLMeshUploadThread();
@@ -656,7 +659,7 @@ public:
     void doWholeModelUpload();
     void requestWholeModelFee();
 
-    void wholeModelToLLSD(LLSD& dest, bool include_textures);
+    void wholeModelToLLSD(LLSD& dest, std::vector<std::string>& texture_list_dest, bool include_textures);
 
     void decomposeMeshMatrix(LLMatrix4& transformation,
                              LLVector3& result_pos,
@@ -677,6 +680,7 @@ private:
 
     bool mDoUpload; // if false only model data will be requested, otherwise the model will be uploaded
     LLSD mModelData;
+    std::vector<std::string> mTextureFiles;
 
     // llcorehttp library interface objects.
     LLCore::HttpStatus                  mHttpStatus;
@@ -799,7 +803,9 @@ public:
 
     void uploadModel(std::vector<LLModelInstance>& data, LLVector3& scale, bool upload_textures,
                      bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position,
-                     std::string upload_url, bool do_upload = true,
+                     std::string upload_url,
+                     const LLUUID& destination_folder_id = LLUUID::null,
+                     bool do_upload = true,
                      LLHandle<LLWholeModelFeeObserver> fee_observer= (LLHandle<LLWholeModelFeeObserver>()),
                      LLHandle<LLWholeModelUploadObserver> upload_observer = (LLHandle<LLWholeModelUploadObserver>()));
 
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 64ea1710f5..2fdb1a7bd3 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -2350,7 +2350,7 @@ void LLModelPreview::updateStatusMessages()
 
         if (lod != lod_high)
         {
-            if (total_submeshes[lod] && total_submeshes[lod] != total_submeshes[lod_high])
+            if (total_submeshes[lod] && total_submeshes[lod] > total_submeshes[lod_high])
             { //number of submeshes is different
                 message = "mesh_status_submesh_mismatch";
                 upload_status[lod] = 2;
@@ -3325,7 +3325,6 @@ bool LLModelPreview::render()
             fmp->setViewOptionEnabled("show_skin_weight", show_skin_weight);
         }
     }
-    //if (this) return TRUE;
 
     if (upload_skin && !has_skin_weights)
     { //can't upload skin weights if model has no skin weights
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index b1d5cd9e16..7ab63be009 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -88,9 +88,16 @@ LLOutfitGallery::LLOutfitGallery(const LLOutfitGallery::Params& p)
       mItemsInRow(p.items_in_row),
       mRowPanWidthFactor(p.row_panel_width_factor),
       mGalleryWidthFactor(p.gallery_width_factor),
-      mTextureSelected(NULL)
+      mTextureSelected(NULL),
+      mSortMenu(nullptr)
 {
     updateGalleryWidth();
+
+    LLControlVariable* ctrl = gSavedSettings.getControl("InventoryFavoritesColorText");
+    if (ctrl)
+    {
+        mSavedSettingInvFavColor = ctrl->getSignal()->connect(boost::bind(&LLOutfitGallery::handleInvFavColorChange, this));
+    }
 }
 
 LLOutfitGallery::Params::Params()
@@ -421,19 +428,32 @@ void LLOutfitGallery::updateRowsIfNeeded()
 
 bool compareGalleryItem(LLOutfitGalleryItem* item1, LLOutfitGalleryItem* item2)
 {
-    static LLCachedControl<bool> outfit_gallery_sort_by_name(gSavedSettings, "OutfitGallerySortByName");
-    if(outfit_gallery_sort_by_name ||
-            ((item1->isDefaultImage() && item2->isDefaultImage()) || (!item1->isDefaultImage() && !item2->isDefaultImage())))
-    {
-        std::string name1 = item1->getItemName();
-        std::string name2 = item2->getItemName();
-
-        return (LLStringUtil::compareDict(name1, name2) < 0);
-    }
-    else
+    static LLCachedControl<S32> sort_by_name(gSavedSettings, "OutfitGallerySortOrder", 0);
+    switch (sort_by_name())
     {
-        return item2->isDefaultImage();
+    case 2:
+        // Sort by favorites - favorite items first, then alphabetically
+        if (item1->isFavorite() != item2->isFavorite())
+        {
+            return item1->isFavorite();
+        }
+        break;
+    case 1:
+        // Sort by images - items with non-default images first, then alphabetically
+        if (item1->isDefaultImage() != item2->isDefaultImage())
+        {
+            return item2->isDefaultImage();
+        }
+        break;
+    default:
+        // Sort alphabetically only
+        break;
     }
+
+    // Final comparison is always alphabetical by name
+    std::string name1 = item1->getItemName();
+    std::string name2 = item2->getItemName();
+    return (LLStringUtil::compareDict(name1, name2) < 0);
 }
 
 void LLOutfitGallery::reArrangeRows(S32 row_diff)
@@ -476,6 +496,20 @@ void LLOutfitGallery::updateGalleryWidth()
     mGalleryWidth = mGalleryWidthFactor * mItemsInRow - mItemHorizontalGap;
 }
 
+void LLOutfitGallery::handleInvFavColorChange()
+{
+    for (outfit_map_t::iterator iter = mOutfitMap.begin();
+        iter != mOutfitMap.end();
+        ++iter)
+    {
+        if (!iter->second) continue;
+        LLOutfitGalleryItem* item = (LLOutfitGalleryItem*)iter->second;
+
+        // refresh font color
+        item->setOutfitFavorite(item->isFavorite());
+    }
+}
+
 LLPanel* LLOutfitGallery::addLastRow()
 {
     mRowCount++;
@@ -627,7 +661,7 @@ void LLOutfitGallery::removeFromLastRow(LLOutfitGalleryItem* item)
     mItemPanels.pop_back();
 }
 
-LLOutfitGalleryItem* LLOutfitGallery::buildGalleryItem(std::string name, LLUUID outfit_id)
+LLOutfitGalleryItem* LLOutfitGallery::buildGalleryItem(std::string name, LLUUID outfit_id, bool is_favorite)
 {
     LLOutfitGalleryItem::Params giparams;
     LLOutfitGalleryItem* gitem = LLUICtrlFactory::create<LLOutfitGalleryItem>(giparams);
@@ -636,6 +670,7 @@ LLOutfitGalleryItem* LLOutfitGallery::buildGalleryItem(std::string name, LLUUID
     gitem->setFollowsLeft();
     gitem->setFollowsTop();
     gitem->setOutfitName(name);
+    gitem->setOutfitFavorite(is_favorite);
     gitem->setUUID(outfit_id);
     gitem->setGallery(this);
     return gitem;
@@ -793,8 +828,7 @@ void LLOutfitGallery::updateAddedCategory(LLUUID cat_id)
     LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
     if (!cat) return;
 
-    std::string name = cat->getName();
-    LLOutfitGalleryItem* item = buildGalleryItem(name, cat_id);
+    LLOutfitGalleryItem* item = buildGalleryItem(cat->getName(), cat_id, cat->getIsFavorite());
     mOutfitMap.insert(LLOutfitGallery::outfit_map_value_t(cat_id, item));
     item->setRightMouseDownCallback(boost::bind(&LLOutfitListBase::outfitRightClickCallBack, this,
         _1, _2, _3, cat_id));
@@ -863,6 +897,7 @@ void LLOutfitGallery::updateChangedCategoryName(LLViewerInventoryCategory *cat,
         if (item)
         {
             item->setOutfitName(name);
+            item->setOutfitFavorite(cat->getIsFavorite());
         }
     }
 }
@@ -943,6 +978,10 @@ LLOutfitListGearMenuBase* LLOutfitGallery::createGearMenu()
 
 static LLDefaultChildRegistry::Register<LLOutfitGalleryItem> r("outfit_gallery_item");
 
+bool LLOutfitGalleryItem::sColorSetInitialized = false;
+LLUIColor LLOutfitGalleryItem::sDefaultTextColor;
+LLUIColor LLOutfitGalleryItem::sDefaultFavoriteColor;
+
 LLOutfitGalleryItem::LLOutfitGalleryItem(const Params& p)
     : LLPanel(p),
     mGallery(nullptr),
@@ -954,6 +993,12 @@ LLOutfitGalleryItem::LLOutfitGalleryItem(const Params& p)
     mUUID(LLUUID())
 {
     buildFromFile("panel_outfit_gallery_item.xml");
+    if (!sColorSetInitialized)
+    {
+        sDefaultTextColor = LLUIColorTable::instance().getColor("White", LLColor4::white);
+        sDefaultFavoriteColor = LLUIColorTable::instance().getColor("InventoryFavoriteColor", LLColor4::white);
+        sColorSetInitialized = true;
+    }
 }
 
 LLOutfitGalleryItem::~LLOutfitGalleryItem()
@@ -1000,6 +1045,19 @@ void LLOutfitGalleryItem::draw()
         gl_draw_scaled_image(interior.mLeft - 1, interior.mBottom, interior.getWidth(), interior.getHeight(), mTexturep, UI_VERTEX_COLOR % alpha);
     }
 
+    static LLUICachedControl<bool> draw_star("InventoryFavoritesUseStar", true);
+    if(mFavorite && draw_star())
+    {
+        const S32 HPAD = 3;
+        const S32 VPAD = 6; // includes padding for text and for the image
+        const S32 image_size = 14;
+        static LLPointer<LLUIImage> fav_img = LLRender2D::getInstance()->getUIImage("Inv_Favorite_Star_Full");
+
+        const F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
+        gl_draw_scaled_image(
+            border.getWidth() - image_size - HPAD, image_size + VPAD + mOutfitNameText->getRect().getHeight(),
+            image_size, image_size, fav_img->getImage(), UI_VERTEX_COLOR % alpha);
+     }
 }
 
 void LLOutfitGalleryItem::setOutfitName(std::string name)
@@ -1009,18 +1067,28 @@ void LLOutfitGalleryItem::setOutfitName(std::string name)
     mOutfitName = name;
 }
 
+void LLOutfitGalleryItem::setOutfitFavorite(bool is_favorite)
+{
+    mFavorite = is_favorite;
+
+    static LLCachedControl<bool> use_color(gSavedSettings, "InventoryFavoritesColorText");
+    mOutfitNameText->setReadOnlyColor((mFavorite && use_color()) ? sDefaultFavoriteColor : sDefaultTextColor);
+}
+
 void LLOutfitGalleryItem::setOutfitWorn(bool value)
 {
     mWorn = value;
     LLStringUtil::format_map_t worn_string_args;
     std::string worn_string = getString("worn_string", worn_string_args);
-    LLUIColor text_color = LLUIColorTable::instance().getColor("White", LLColor4::white);
-    mOutfitWornText->setReadOnlyColor(text_color);
-    mOutfitNameText->setReadOnlyColor(text_color);
+    mOutfitWornText->setReadOnlyColor(sDefaultTextColor.get());
+    mOutfitNameText->setReadOnlyColor(sDefaultTextColor.get());
     mOutfitWornText->setFont(value ? LLFontGL::getFontSansSerifBold() : LLFontGL::getFontSansSerifSmall());
     mOutfitNameText->setFont(value ? LLFontGL::getFontSansSerifBold() : LLFontGL::getFontSansSerifSmall());
     mOutfitWornText->setValue(value ? worn_string : "");
     mOutfitNameText->setText(mOutfitName); // refresh LLTextViewModel to pick up font changes
+
+    static LLCachedControl<bool> use_color(gSavedSettings, "InventoryFavoritesColorText");
+    mOutfitNameText->setReadOnlyColor((mFavorite && use_color()) ? sDefaultFavoriteColor : sDefaultTextColor);
 }
 
 void LLOutfitGalleryItem::setSelected(bool value)
@@ -1172,6 +1240,7 @@ LLContextMenu* LLOutfitGalleryContextMenu::createMenu()
     registrar.add("Outfit.Delete", boost::bind(LLOutfitGallery::onRemoveOutfit, selected_id));
     registrar.add("Outfit.Create", boost::bind(&LLOutfitGalleryContextMenu::onCreate, this, _2));
     registrar.add("Outfit.Thumbnail", boost::bind(&LLOutfitGalleryContextMenu::onThumbnail, this, selected_id));
+    registrar.add("Outfit.Favorite", boost::bind(&LLOutfitGalleryContextMenu::onFavorite, this, selected_id));
     registrar.add("Outfit.Save", boost::bind(&LLOutfitGalleryContextMenu::onSave, this, selected_id));
     enable_registrar.add("Outfit.OnEnable", boost::bind(&LLOutfitGalleryContextMenu::onEnable, this, _2));
     enable_registrar.add("Outfit.OnVisible", boost::bind(&LLOutfitGalleryContextMenu::onVisible, this, _2));
@@ -1210,25 +1279,12 @@ void LLOutfitGalleryGearMenu::onUpdateItemsVisibility()
 {
     if (!mMenu) return;
     bool have_selection = getSelectedOutfitID().notNull();
-    mMenu->setItemVisible("expand", false);
-    mMenu->setItemVisible("collapse", false);
     mMenu->setItemVisible("thumbnail", have_selection);
     mMenu->setItemVisible("sepatator3", true);
     mMenu->setItemVisible("sort_folders_by_name", true);
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
 }
 
-void LLOutfitGalleryGearMenu::onChangeSortOrder()
-{
-    bool sort_by_name = !gSavedSettings.getBOOL("OutfitGallerySortByName");
-    gSavedSettings.setBOOL("OutfitGallerySortByName", sort_by_name);
-    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
-    if (gallery)
-    {
-        gallery->reArrangeRows();
-    }
-}
-
 bool LLOutfitGalleryGearMenu::hasDefaultImage()
 {
     LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mOutfitList);
@@ -1345,6 +1401,15 @@ void LLOutfitGallery::refreshOutfit(const LLUUID& category_id)
     }
 }
 
+LLToggleableMenu* LLOutfitGallery::getSortMenu()
+{
+    if (!mSortMenu)
+    {
+        mSortMenu = new LLOutfitGallerySortMenu(this);
+    }
+    return mSortMenu->getMenu();
+}
+
 LLUUID LLOutfitGallery::getPhotoAssetId(const LLUUID& outfit_id)
 {
     outfit_map_t::iterator outfit_it = mOutfitMap.find(outfit_id);
@@ -1360,3 +1425,84 @@ LLUUID LLOutfitGallery::getDefaultPhoto()
     return LLUUID();
 }
 
+
+//////////////////// LLOutfitGallerySortMenu ////////////////////
+
+LLOutfitGallerySortMenu::LLOutfitGallerySortMenu(LLOutfitListBase* parent_panel)
+    : mPanelHandle(parent_panel->getHandle())
+{
+    LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
+    LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
+
+    registrar.add("Sort.OnSort", boost::bind(&LLOutfitGallerySortMenu::onSort, this, _2));
+    enable_registrar.add("Sort.OnEnable", boost::bind(&LLOutfitGallerySortMenu::onEnable, this, _2));
+
+    mMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>(
+        "menu_outfit_gallery_sort.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+    llassert(mMenu);
+}
+
+
+LLToggleableMenu* LLOutfitGallerySortMenu::getMenu()
+{
+    return mMenu;
+}
+
+void LLOutfitGallerySortMenu::updateItemsVisibility()
+{
+    onUpdateItemsVisibility();
+}
+
+void LLOutfitGallerySortMenu::onUpdateItemsVisibility()
+{
+    if (!mMenu) return;
+}
+
+bool LLOutfitGallerySortMenu::onEnable(LLSD::String param)
+{
+    static LLCachedControl<S32> sort_order(gSavedSettings, "OutfitGallerySortOrder", 0);
+    if ("favorites_to_top" == param)
+    {
+        return sort_order == 2;
+    }
+    else if ("images_to_top" == param)
+    {
+        return sort_order == 1;
+    }
+    else if ("by_name" == param)
+    {
+        return sort_order == 0;
+    }
+
+    return false;
+}
+
+void LLOutfitGallerySortMenu::onSort(LLSD::String param)
+{
+    S32 sort_order = gSavedSettings.getS32("OutfitGallerySortOrder");
+    S32 new_sort_order = 0;
+    if ("favorites_to_top" == param)
+    {
+        new_sort_order = 2;
+    }
+    else if ("images_to_top" == param)
+    {
+        new_sort_order = 1;
+    }
+    else if ("by_name" == param)
+    {
+        new_sort_order = 0;
+    }
+    if (sort_order == new_sort_order)
+    {
+        new_sort_order = sort_order ? 0 : 1;
+    }
+    gSavedSettings.setS32("OutfitGallerySortOrder", new_sort_order);
+
+    LLOutfitGallery* gallery = dynamic_cast<LLOutfitGallery*>(mPanelHandle.get());
+    if (gallery)
+    {
+        gallery->reArrangeRows();
+    }
+}
+
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 541ea2f9d4..5801a32a39 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -42,11 +42,13 @@ class LLOutfitGalleryItem;
 class LLOutfitListGearMenuBase;
 class LLOutfitGalleryGearMenu;
 class LLOutfitGalleryContextMenu;
+class LLOutfitGallerySortMenu;
 
 class LLOutfitGallery : public LLOutfitListBase
 {
 public:
     friend class LLOutfitGalleryGearMenu;
+    friend class LLOutfitGallerySortMenu;
     friend class LLOutfitGalleryContextMenu;
     friend class LLUpdateGalleryOnPhotoLinked;
 
@@ -102,10 +104,12 @@ public:
 
     /*virtual*/ bool getHasExpandableFolders() { return false; }
 
+    /*virtual*/ void onChangeSortOrder(const LLSD& userdata) {};
     void updateMessageVisibility();
     bool hasDefaultImage(const LLUUID& outfit_cat_id);
 
     void refreshOutfit(const LLUUID& category_id);
+    virtual LLToggleableMenu* getSortMenu();
 
 protected:
     /*virtual*/ void onHighlightBaseOutfit(LLUUID base_id, LLUUID prev_id);
@@ -133,8 +137,9 @@ private:
     void reArrangeRows(S32 row_diff = 0);
     void updateRowsIfNeeded();
     void updateGalleryWidth();
+    void handleInvFavColorChange();
 
-    LLOutfitGalleryItem* buildGalleryItem(std::string name, LLUUID outfit_id);
+    LLOutfitGalleryItem* buildGalleryItem(std::string name, LLUUID outfit_id, bool is_favorite);
     LLOutfitGalleryItem* getSelectedItem() const;
     LLOutfitGalleryItem* getItem(const LLUUID& id) const;
 
@@ -176,6 +181,7 @@ private:
     int mGalleryWidthFactor;
 
     LLListContextMenu* mOutfitGalleryMenu;
+    LLOutfitGallerySortMenu* mSortMenu;
 
     typedef std::map<LLUUID, LLOutfitGalleryItem*>      outfit_map_t;
     typedef outfit_map_t::value_type                    outfit_map_value_t;
@@ -187,6 +193,8 @@ private:
 
 
     LLInventoryCategoriesObserver*  mOutfitsObserver;
+
+    boost::signals2::connection mSavedSettingInvFavColor;
 };
 class LLOutfitGalleryContextMenu : public LLOutfitContextMenu
 {
@@ -213,8 +221,6 @@ public:
 protected:
     /*virtual*/ void onUpdateItemsVisibility();
 private:
-    /*virtual*/ void onChangeSortOrder();
-
     bool hasDefaultImage();
 };
 
@@ -243,6 +249,7 @@ public:
     bool setImageAssetId(LLUUID asset_id);
     LLUUID getImageAssetId();
     void setOutfitName(std::string name);
+    void setOutfitFavorite(bool is_favorite);
     void setOutfitWorn(bool value);
     void setSelected(bool value);
     void setUUID(const LLUUID &outfit_id) {mUUID = outfit_id;}
@@ -250,6 +257,7 @@ public:
 
     std::string getItemName() {return mOutfitName;}
     bool isDefaultImage() {return mDefaultImage;}
+    bool isFavorite() { return mFavorite; }
 
     bool isHidden() {return mHidden;}
     void setHidden(bool hidden) {mHidden = hidden;}
@@ -267,7 +275,29 @@ private:
     bool     mWorn;
     bool     mDefaultImage;
     bool     mHidden;
+    bool     mFavorite;
     std::string mOutfitName;
+
+    static bool sColorSetInitialized;
+    static LLUIColor sDefaultTextColor;
+    static LLUIColor sDefaultFavoriteColor;
+};
+
+class LLOutfitGallerySortMenu
+{
+public:
+    LLOutfitGallerySortMenu(LLOutfitListBase* parent_panel);
+
+    LLToggleableMenu* getMenu();
+    void updateItemsVisibility();
+
+private:
+    void onUpdateItemsVisibility();
+    bool onEnable(LLSD::String param);
+    void onSort(LLSD::String param);
+
+    LLToggleableMenu* mMenu;
+    LLHandle<LLPanel> mPanelHandle;
 };
 
 #endif  // LL_LLOUTFITGALLERYCTRL_H
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 6e666b8a4b..b9795f217f 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -35,6 +35,7 @@
 #include "llaccordionctrltab.h"
 #include "llagentwearables.h"
 #include "llappearancemgr.h"
+#include "llappviewer.h"
 #include "llfloaterreg.h"
 #include "llfloatersidepanelcontainer.h"
 #include "llinspecttexture.h"
@@ -45,6 +46,7 @@
 #include "lloutfitobserver.h"
 #include "lltoggleablemenu.h"
 #include "lltransutil.h"
+#include "llviewercontrol.h"
 #include "llviewermenu.h"
 #include "llvoavatar.h"
 #include "llvoavatarself.h"
@@ -53,14 +55,24 @@
 static bool is_tab_header_clicked(LLAccordionCtrlTab* tab, S32 y);
 
 static const LLOutfitTabNameComparator OUTFIT_TAB_NAME_COMPARATOR;
+static const LLOutfitTabFavComparator OUTFIT_TAB_FAV_COMPARATOR;
 
 /*virtual*/
 bool LLOutfitTabNameComparator::compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const
 {
-    std::string name1 = tab1->getTitle();
-    std::string name2 = tab2->getTitle();
+    return (LLStringUtil::compareDict(tab1->getTitle(), tab2->getTitle()) < 0);
+}
+
+bool LLOutfitTabFavComparator::compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const
+{
+    LLOutfitAccordionCtrlTab* taba = (LLOutfitAccordionCtrlTab*)tab1;
+    LLOutfitAccordionCtrlTab* tabb = (LLOutfitAccordionCtrlTab*)tab2;
+    if (taba->getFavorite() != tabb->getFavorite())
+    {
+        return taba->getFavorite();
+    }
 
-    return (LLStringUtil::compareDict(name1, name2) < 0);
+    return (LLStringUtil::compareDict(tab1->getTitle(), tab2->getTitle()) < 0);
 }
 
 struct outfit_accordion_tab_params : public LLInitParam::Block<outfit_accordion_tab_params, LLOutfitAccordionCtrlTab::Params>
@@ -80,6 +92,9 @@ const outfit_accordion_tab_params& get_accordion_tab_params()
     {
         initialized = true;
 
+        LLOutfitAccordionCtrlTab::sFavoriteIcon = LLUI::getUIImage("Inv_Favorite_Star_Full");
+        LLOutfitAccordionCtrlTab::sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", LLColor4U(255, 255, 255));
+
         LLXMLNodePtr xmlNode;
         if (LLUICtrlFactory::getLayeredXMLNode("outfit_accordion_tab.xml", xmlNode))
         {
@@ -103,11 +118,20 @@ LLOutfitsList::LLOutfitsList()
     ,   mAccordion(NULL)
     ,   mListCommands(NULL)
     ,   mItemSelected(false)
+    ,   mSortMenu(nullptr)
 {
+    LLControlVariable* ctrl = gSavedSettings.getControl("InventoryFavoritesColorText");
+    if (ctrl)
+    {
+        mSavedSettingInvFavColor = ctrl->getSignal()->connect(boost::bind(&LLOutfitsList::handleInvFavColorChange, this));
+    }
 }
 
 LLOutfitsList::~LLOutfitsList()
 {
+    delete mSortMenu;
+    mSavedSettingInvFavColor.disconnect();
+    mGearMenuConnection.disconnect();
 }
 
 bool LLOutfitsList::postBuild()
@@ -115,9 +139,25 @@ bool LLOutfitsList::postBuild()
     mAccordion = getChild<LLAccordionCtrl>("outfits_accordion");
     mAccordion->setComparator(&OUTFIT_TAB_NAME_COMPARATOR);
 
+    initComparator();
+
     return LLOutfitListBase::postBuild();
 }
 
+void LLOutfitsList::initComparator()
+{
+    S32 mode = gSavedSettings.getS32("OutfitListSortOrder");
+    if (mode == 0)
+    {
+        mAccordion->setComparator(&OUTFIT_TAB_NAME_COMPARATOR);
+    }
+    else
+    {
+        mAccordion->setComparator(&OUTFIT_TAB_FAV_COMPARATOR);
+    }
+    sortOutfits();
+}
+
 //virtual
 void LLOutfitsList::onOpen(const LLSD& info)
 {
@@ -154,6 +194,7 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
 
     tab->setName(name);
     tab->setTitle(name);
+    tab->setFavorite(cat->getIsFavorite());
 
     // *TODO: LLUICtrlFactory::defaultBuilder does not use "display_children" from xml. Should be investigated.
     tab->setDisplayChildren(false);
@@ -183,8 +224,9 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
     // Setting callback to reset items selection inside outfit on accordion collapsing and expanding (EXT-7875)
     tab->setDropDownStateChangedCallback(boost::bind(&LLOutfitsList::resetItemSelection, this, list, cat_id));
 
-    // force showing list items that don't match current filter(EXT-7158)
-    list->setForceShowingUnmatchedItems(true);
+    // Depending on settings, force showing list items that don't match current filter(EXT-7158)
+    static LLCachedControl<bool> list_filter(gSavedSettings, "OutfitListFilterFullList");
+    list->setForceShowingUnmatchedItems(list_filter(), false);
 
     // Setting list commit callback to monitor currently selected wearable item.
     list->setCommitCallback(boost::bind(&LLOutfitsList::onListSelectionChange, this, _1));
@@ -249,13 +291,11 @@ void LLOutfitsList::onHighlightBaseOutfit(LLUUID base_id, LLUUID prev_id)
 {
     if (mOutfitsMap[prev_id])
     {
-        mOutfitsMap[prev_id]->setTitleFontStyle("NORMAL");
-        mOutfitsMap[prev_id]->setTitleColor(LLUIColorTable::instance().getColor("AccordionHeaderTextColor"));
+        ((LLOutfitAccordionCtrlTab*)mOutfitsMap[prev_id])->setOutfitSelected(false);
     }
     if (mOutfitsMap[base_id])
     {
-        mOutfitsMap[base_id]->setTitleFontStyle("BOLD");
-        mOutfitsMap[base_id]->setTitleColor(LLUIColorTable::instance().getColor("SelectedOutfitTextColor"));
+        ((LLOutfitAccordionCtrlTab*)mOutfitsMap[base_id])->setOutfitSelected(true);
     }
 }
 
@@ -313,6 +353,11 @@ void LLOutfitsList::onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid)
     }
 }
 
+void LLOutfitListBase::onAction(const LLSD& userdata)
+{
+    performAction(userdata.asString());
+}
+
 // virtual
 bool LLOutfitListBase::isActionEnabled(const LLSD& userdata)
 {
@@ -425,11 +470,12 @@ void LLOutfitsList::updateChangedCategoryName(LLViewerInventoryCategory *cat, st
     if (outfits_iter != mOutfitsMap.end())
     {
         // Update tab name with the new category name.
-        LLAccordionCtrlTab* tab = outfits_iter->second;
+        LLOutfitAccordionCtrlTab* tab = (LLOutfitAccordionCtrlTab*) outfits_iter->second;
         if (tab)
         {
             tab->setName(name);
             tab->setTitle(name);
+            tab->setFavorite(cat->getIsFavorite());
         }
     }
 }
@@ -521,7 +567,7 @@ void LLOutfitsList::onFilterSubStringChanged(const std::string& new_string, cons
         LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
         if (list)
         {
-            list->setFilterSubString(new_string, tab->getDisplayChildren());
+            list->setFilterSubString(new_string, true);
         }
 
         if (old_string.empty())
@@ -738,6 +784,75 @@ void LLOutfitsList::onOutfitRightClick(LLUICtrl* ctrl, S32 x, S32 y, const LLUUI
     }
 }
 
+void LLOutfitsList::handleInvFavColorChange()
+{
+    for (outfits_map_t::iterator iter = mOutfitsMap.begin();
+        iter != mOutfitsMap.end();
+        ++iter)
+    {
+        if (!iter->second) continue;
+        LLOutfitAccordionCtrlTab* tab = (LLOutfitAccordionCtrlTab*)iter->second;
+
+        // refresh font color
+        tab->setFavorite(tab->getFavorite());
+    }
+}
+
+void LLOutfitsList::onChangeSortOrder(const LLSD& userdata)
+{
+    std::string sort_data = userdata.asString();
+    if (sort_data == "favorites_to_top")
+    {
+        // at the moment this is a toggle
+        S32 val = gSavedSettings.getS32("OutfitListSortOrder");
+        gSavedSettings.setS32("OutfitListSortOrder", (val ? 0 : 1));
+
+        initComparator();
+    }
+    else if (sort_data == "show_entire_outfit")
+    {
+        bool new_val = !gSavedSettings.getBOOL("OutfitListFilterFullList");
+        gSavedSettings.setBOOL("OutfitListFilterFullList", new_val);
+
+        if (!getFilterSubString().empty())
+        {
+            for (outfits_map_t::value_type& outfit : mOutfitsMap)
+            {
+                LLAccordionCtrlTab* tab = outfit.second;
+                const LLUUID& category_id = outfit.first;
+                if (!tab) continue;
+
+                LLWearableItemsList* list = dynamic_cast<LLWearableItemsList*>(tab->getAccordionView());
+                if (list)
+                {
+                    list->setForceRefresh(true);
+                    list->setForceShowingUnmatchedItems(new_val, tab->getDisplayChildren());
+                }
+                applyFilterToTab(category_id, tab, getFilterSubString());
+            }
+            mAccordion->arrange();
+        }
+    }
+}
+
+LLToggleableMenu* LLOutfitsList::getSortMenu()
+{
+    if (!mSortMenu)
+    {
+        mSortMenu = new LLOutfitListSortMenu(this);
+    }
+    return mSortMenu->getMenu();
+}
+
+void LLOutfitsList::updateMenuItemsVisibility()
+{
+    if (mSortMenu)
+    {
+        mSortMenu->updateItemsVisibility();
+    }
+    LLOutfitListBase::updateMenuItemsVisibility();
+}
+
 LLOutfitListGearMenuBase* LLOutfitsList::createGearMenu()
 {
     return new LLOutfitListGearMenu(this);
@@ -755,10 +870,10 @@ bool is_tab_header_clicked(LLAccordionCtrlTab* tab, S32 y)
 LLOutfitListBase::LLOutfitListBase()
     :   LLPanelAppearanceTab()
     ,   mIsInitialized(false)
+    ,   mGearMenu(nullptr)
 {
     mCategoriesObserver = new LLInventoryCategoriesObserver();
     mOutfitMenu = new LLOutfitContextMenu(this);
-    //mGearMenu = createGearMenu();
 }
 
 LLOutfitListBase::~LLOutfitListBase()
@@ -821,6 +936,10 @@ void LLOutfitListBase::observerCallback(const LLUUID& category_id)
 
 void LLOutfitListBase::refreshList(const LLUUID& category_id)
 {
+    if (LLAppViewer::instance()->quitRequested())
+    {
+        return;
+    }
     bool wasNull = mRefreshListState.CategoryUUID.isNull();
     mRefreshListState.CategoryUUID.setNull();
 
@@ -879,8 +998,18 @@ void LLOutfitListBase::onIdle(void* userdata)
 
 void LLOutfitListBase::onIdleRefreshList()
 {
+    if (LLAppViewer::instance()->quitRequested())
+    {
+        mRefreshListState.CategoryUUID.setNull();
+        gIdleCallbacks.deleteFunction(onIdle, this);
+        return;
+    }
     if (mRefreshListState.CategoryUUID.isNull())
+    {
+        LL_WARNS() << "Called onIdleRefreshList without id" << LL_ENDL;
+        gIdleCallbacks.deleteFunction(onIdle, this);
         return;
+    }
 
     const F64 MAX_TIME = 0.05f;
     F64 curent_time = LLTimer::getTotalSeconds();
@@ -1022,12 +1151,6 @@ void LLOutfitListBase::ChangeOutfitSelection(LLWearableItemsList* list, const LL
 
 bool LLOutfitListBase::postBuild()
 {
-    mGearMenu = createGearMenu();
-
-    LLMenuButton* menu_gear_btn = getChild<LLMenuButton>("options_gear_btn");
-
-    menu_gear_btn->setMouseDownCallback(boost::bind(&LLOutfitListGearMenuBase::updateItemsVisibility, mGearMenu));
-    menu_gear_btn->setMenu(mGearMenu->getMenu());
     return true;
 }
 
@@ -1041,6 +1164,20 @@ void LLOutfitListBase::expandAllFolders()
     onExpandAllFolders();
 }
 
+void LLOutfitListBase::updateMenuItemsVisibility()
+{
+    mGearMenu->updateItemsVisibility();
+}
+
+LLToggleableMenu* LLOutfitListBase::getGearMenu()
+{
+    if (!mGearMenu)
+    {
+        mGearMenu = createGearMenu();
+    }
+    return mGearMenu->getMenu();
+};
+
 void LLOutfitListBase::deselectOutfit(const LLUUID& category_id)
 {
     // Reset selection if the outfit is selected.
@@ -1067,6 +1204,7 @@ LLContextMenu* LLOutfitContextMenu::createMenu()
     registrar.add("Outfit.Rename", boost::bind(renameOutfit, selected_id));
     registrar.add("Outfit.Delete", boost::bind(&LLOutfitListBase::removeSelected, mOutfitList));
     registrar.add("Outfit.Thumbnail", boost::bind(&LLOutfitContextMenu::onThumbnail, this, selected_id));
+    registrar.add("Outfit.Favorite", boost::bind(&LLOutfitContextMenu::onFavorite, this, selected_id));
     registrar.add("Outfit.Save", boost::bind(&LLOutfitContextMenu::onSave, this, selected_id));
 
     enable_registrar.add("Outfit.OnEnable", boost::bind(&LLOutfitContextMenu::onEnable, this, _2));
@@ -1117,6 +1255,16 @@ bool LLOutfitContextMenu::onVisible(LLSD::String param)
     {
         return LLAppearanceMgr::instance().getCanRemoveOutfit(outfit_cat_id);
     }
+    else if ("favorites_add" == param)
+    {
+        LLViewerInventoryCategory* cat = gInventory.getCategory(outfit_cat_id);
+        return cat && !cat->getIsFavorite();
+    }
+    else if ("favorites_remove" == param)
+    {
+        LLViewerInventoryCategory* cat = gInventory.getCategory(outfit_cat_id);
+        return cat && cat->getIsFavorite();
+    }
 
     return true;
 }
@@ -1141,6 +1289,14 @@ void LLOutfitContextMenu::onThumbnail(const LLUUID &outfit_cat_id)
     }
 }
 
+void LLOutfitContextMenu::onFavorite(const LLUUID& outfit_cat_id)
+{
+    if (outfit_cat_id.notNull())
+    {
+        toggle_favorite(outfit_cat_id);
+    }
+}
+
 void LLOutfitContextMenu::onSave(const LLUUID &outfit_cat_id)
 {
     if (outfit_cat_id.notNull())
@@ -1171,14 +1327,13 @@ LLOutfitListGearMenuBase::LLOutfitListGearMenuBase(LLOutfitListBase* olist)
     registrar.add("Gear.Rename", boost::bind(&LLOutfitListGearMenuBase::onRename, this));
     registrar.add("Gear.Delete", boost::bind(&LLOutfitListBase::removeSelected, mOutfitList));
     registrar.add("Gear.Create", boost::bind(&LLOutfitListGearMenuBase::onCreate, this, _2));
-    registrar.add("Gear.Collapse", boost::bind(&LLOutfitListBase::onCollapseAllFolders, mOutfitList));
-    registrar.add("Gear.Expand", boost::bind(&LLOutfitListBase::onExpandAllFolders, mOutfitList));
 
     registrar.add("Gear.WearAdd", boost::bind(&LLOutfitListGearMenuBase::onAdd, this));
     registrar.add("Gear.Save", boost::bind(&LLOutfitListGearMenuBase::onSave, this));
 
     registrar.add("Gear.Thumbnail", boost::bind(&LLOutfitListGearMenuBase::onThumbnail, this));
-    registrar.add("Gear.SortByName", boost::bind(&LLOutfitListGearMenuBase::onChangeSortOrder, this));
+    registrar.add("Gear.Favorite", boost::bind(&LLOutfitListGearMenuBase::onFavorite, this));
+    registrar.add("Gear.SortByImage", boost::bind(&LLOutfitListGearMenuBase::onChangeSortOrder, this));
 
     enable_registrar.add("Gear.OnEnable", boost::bind(&LLOutfitListGearMenuBase::onEnable, this, _2));
     enable_registrar.add("Gear.OnVisible", boost::bind(&LLOutfitListGearMenuBase::onVisible, this, _2));
@@ -1312,6 +1467,16 @@ bool LLOutfitListGearMenuBase::onVisible(LLSD::String param)
     {
         return false;
     }
+    else if ("favorites_add" == param)
+    {
+        LLViewerInventoryCategory* cat = gInventory.getCategory(selected_outfit_id);
+        return cat && !cat->getIsFavorite();
+    }
+    else if ("favorites_remove" == param)
+    {
+        LLViewerInventoryCategory* cat = gInventory.getCategory(selected_outfit_id);
+        return cat && cat->getIsFavorite();
+    }
 
     return true;
 }
@@ -1323,6 +1488,12 @@ void LLOutfitListGearMenuBase::onThumbnail()
     LLFloaterReg::showInstance("change_item_thumbnail", data);
 }
 
+void LLOutfitListGearMenuBase::onFavorite()
+{
+    const LLUUID& selected_outfit_id = getSelectedOutfitID();
+    toggle_favorite(selected_outfit_id);
+}
+
 void LLOutfitListGearMenuBase::onChangeSortOrder()
 {
 
@@ -1338,14 +1509,79 @@ LLOutfitListGearMenu::~LLOutfitListGearMenu()
 void LLOutfitListGearMenu::onUpdateItemsVisibility()
 {
     if (!mMenu) return;
-    mMenu->setItemVisible("expand", true);
-    mMenu->setItemVisible("collapse", true);
     mMenu->setItemVisible("thumbnail", getSelectedOutfitID().notNull());
+    mMenu->setItemVisible("favorite", getSelectedOutfitID().notNull());
     mMenu->setItemVisible("sepatator3", false);
     mMenu->setItemVisible("sort_folders_by_name", false);
     LLOutfitListGearMenuBase::onUpdateItemsVisibility();
 }
 
+//////////////////// LLOutfitListSortMenu ////////////////////
+
+LLOutfitListSortMenu::LLOutfitListSortMenu(LLOutfitListBase* parent_panel)
+    : mPanelHandle(parent_panel->getHandle())
+{
+    LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
+    LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
+
+    registrar.add("Sort.Collapse", boost::bind(&LLOutfitListBase::onCollapseAllFolders, parent_panel));
+    registrar.add("Sort.Expand", boost::bind(&LLOutfitListBase::onExpandAllFolders, parent_panel));
+    registrar.add("Sort.OnSort", boost::bind(&LLOutfitListBase::onChangeSortOrder, parent_panel, _2));
+    enable_registrar.add("Sort.OnEnable", boost::bind(&LLOutfitListSortMenu::onEnable, this, _2));
+
+    mMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>(
+        "menu_outfit_list_sort.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
+    llassert(mMenu);
+}
+
+
+LLToggleableMenu* LLOutfitListSortMenu::getMenu()
+{
+    return mMenu;
+}
+
+void LLOutfitListSortMenu::updateItemsVisibility()
+{
+    onUpdateItemsVisibility();
+}
+
+void LLOutfitListSortMenu::onUpdateItemsVisibility()
+{
+    if (!mMenu) return;
+    mMenu->setItemVisible("expand", true);
+    mMenu->setItemVisible("collapse", true);
+    mMenu->setItemVisible("sort_favorites_to_top", true);
+    mMenu->setItemVisible("show_entire_outfit_in_search", true);
+}
+
+bool LLOutfitListSortMenu::onEnable(LLSD::String param)
+{
+    if ("favorites_to_top" == param)
+    {
+        static LLCachedControl<S32> sort_order(gSavedSettings, "OutfitListSortOrder", 0);
+        return sort_order == 1;
+    }
+    else if ("show_entire_outfit" == param)
+    {
+        static LLCachedControl<bool> filter_mode(gSavedSettings, "OutfitListFilterFullList", 0);
+        return filter_mode;
+    }
+
+    return false;
+}
+
+
+//////////////////// LLOutfitAccordionCtrlTab ////////////////////
+
+LLUIImage* LLOutfitAccordionCtrlTab::sFavoriteIcon;
+LLUIColor LLOutfitAccordionCtrlTab::sFgColor;
+
+void LLOutfitAccordionCtrlTab::draw()
+{
+    LLAccordionCtrlTab::draw();
+    drawFavoriteIcon();
+}
+
 bool LLOutfitAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 {
     if (y >= getLocalRect().getHeight() - getHeaderHeight())
@@ -1366,4 +1602,54 @@ bool LLOutfitAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
 
     return LLAccordionCtrlTab::handleToolTip(x, y, mask);
 }
+
+void LLOutfitAccordionCtrlTab::setFavorite(bool is_favorite)
+{
+    mIsFavorite = is_favorite;
+    updateTitleColor();
+}
+
+void LLOutfitAccordionCtrlTab::setOutfitSelected(bool val)
+{
+    mIsSelected = val;
+    setTitleFontStyle(mIsSelected ? "BOLD" : "NORMAL");
+    updateTitleColor();
+    }
+
+void LLOutfitAccordionCtrlTab::updateTitleColor()
+    {
+        static LLUICachedControl<bool> highlight_color("InventoryFavoritesColorText", true);
+        if (mIsFavorite && highlight_color())
+        {
+            setTitleColor(LLUIColorTable::instance().getColor("InventoryFavoriteColor"));
+        }
+    else if (mIsSelected)
+    {
+        setTitleColor(LLUIColorTable::instance().getColor("SelectedOutfitTextColor"));
+    }
+        else
+        {
+            setTitleColor(LLUIColorTable::instance().getColor("AccordionHeaderTextColor"));
+        }
+    }
+
+void LLOutfitAccordionCtrlTab::drawFavoriteIcon()
+{
+    if (!mIsFavorite)
+    {
+        return;
+    }
+    static LLUICachedControl<bool> draw_star("InventoryFavoritesUseStar", true);
+    if (!draw_star)
+    {
+        return;
+    }
+
+    const S32 PAD = 2;
+    const S32 image_size = 18;
+
+    gl_draw_scaled_image(
+        getRect().getWidth() - image_size - PAD, getRect().getHeight() - image_size - PAD,
+        image_size, image_size, sFavoriteIcon->getImage(), sFgColor);
+}
 // EOF
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index f581b419d9..bafc0fbb81 100644
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -41,6 +41,7 @@
 class LLAccordionCtrlTab;
 class LLInventoryCategoriesObserver;
 class LLOutfitListGearMenuBase;
+class LLOutfitListSortMenuBase;
 class LLWearableItemsList;
 class LLListContextMenu;
 
@@ -61,6 +62,17 @@ public:
     /*virtual*/ bool compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const;
 };
 
+class LLOutfitTabFavComparator : public LLAccordionCtrl::LLTabComparator
+{
+    LOG_CLASS(LLOutfitTabFavComparator);
+
+public:
+    LLOutfitTabFavComparator() {};
+    virtual ~LLOutfitTabFavComparator() {};
+
+    /*virtual*/ bool compare(const LLAccordionCtrlTab* tab1, const LLAccordionCtrlTab* tab2) const;
+};
+
 class LLOutfitListBase : public LLPanelAppearanceTab
 {
 public:
@@ -92,6 +104,7 @@ public:
     boost::signals2::connection setSelectionChangeCallback(selection_change_callback_t cb);
     void outfitRightClickCallBack(LLUICtrl* ctrl, S32 x, S32 y, const LLUUID& cat_id);
 
+    void onAction(const LLSD& userdata);
     virtual bool isActionEnabled(const LLSD& userdata);
     virtual void performAction(std::string action);
     virtual bool hasItemSelected() = 0;
@@ -109,6 +122,12 @@ public:
 
     virtual bool getHasExpandableFolders() = 0;
 
+    virtual void onChangeSortOrder(const LLSD& userdata) = 0;
+
+    virtual void updateMenuItemsVisibility();
+    virtual LLToggleableMenu* getGearMenu();
+    virtual bool getTrashMenuVisible() { return true; };
+
 protected:
     void observerCallback(const LLUUID& category_id);
     virtual LLOutfitListGearMenuBase* createGearMenu() = 0;
@@ -139,6 +158,7 @@ protected:
     selection_change_signal_t       mSelectionChangeSignal;
     LLListContextMenu*              mOutfitMenu;
     LLOutfitListGearMenuBase*       mGearMenu;
+    boost::signals2::connection     mGearMenuConnection;
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -155,7 +175,6 @@ protected:
     /* virtual */ LLContextMenu* createMenu();
 
     bool onEnable(LLSD::String param);
-
     bool onVisible(LLSD::String param);
 
     static void editOutfit();
@@ -163,6 +182,7 @@ protected:
     static void renameOutfit(const LLUUID& outfit_cat_id);
 
     void onThumbnail(const LLUUID &outfit_cat_id);
+    void onFavorite(const LLUUID& outfit_cat_id);
     void onSave(const LLUUID &outfit_cat_id);
 
 private:
@@ -182,6 +202,7 @@ public:
 protected:
     virtual void onUpdateItemsVisibility();
     virtual void onThumbnail();
+    virtual void onFavorite();
     virtual void onChangeSortOrder();
 
     const LLUUID& getSelectedOutfitID();
@@ -202,6 +223,23 @@ private:
     bool onVisible(LLSD::String param);
 };
 
+class LLOutfitListSortMenu
+{
+public:
+    LLOutfitListSortMenu(LLOutfitListBase* parent_panel);
+
+    LLToggleableMenu* getMenu();
+    void updateItemsVisibility();
+
+private:
+    void onUpdateItemsVisibility();
+    bool onEnable(LLSD::String param);
+
+    LLToggleableMenu* mMenu;
+    LLHandle<LLPanel> mPanelHandle;
+};
+
+
 class LLOutfitListGearMenu : public LLOutfitListGearMenuBase
 {
 public:
@@ -221,8 +259,16 @@ public:
         Params() : cat_id("cat_id") {}
     };
 
+    virtual void draw();
     virtual bool handleToolTip(S32 x, S32 y, MASK mask);
 
+    void setFavorite(bool is_favorite);
+    bool getFavorite() const { return mIsFavorite; }
+    void setOutfitSelected(bool val);
+
+    static LLUIImage* sFavoriteIcon;
+    static LLUIColor sFgColor;
+
  protected:
     LLOutfitAccordionCtrlTab(const LLOutfitAccordionCtrlTab::Params &p)
         : LLAccordionCtrlTab(p),
@@ -230,7 +276,12 @@ public:
     {}
     friend class LLUICtrlFactory;
 
+    void updateTitleColor();
+    void drawFavoriteIcon();
+
     LLUUID mFolderID;
+    bool mIsFavorite = false;
+    bool mIsSelected = false;
 };
   /**
  * @class LLOutfitsList
@@ -249,6 +300,7 @@ public:
     virtual ~LLOutfitsList();
 
     /*virtual*/ bool postBuild();
+    void initComparator();
 
     /*virtual*/ void onOpen(const LLSD& info);
 
@@ -287,6 +339,10 @@ public:
 
     /*virtual*/ bool getHasExpandableFolders() { return true; }
 
+    /*virtual*/ void onChangeSortOrder(const LLSD& userdata);
+    virtual LLToggleableMenu* getSortMenu();
+    void updateMenuItemsVisibility();
+
 protected:
     LLOutfitListGearMenuBase* createGearMenu();
 
@@ -357,6 +413,8 @@ private:
 
     static void onOutfitRename(const LLSD& notification, const LLSD& response);
 
+    void handleInvFavColorChange();
+
     //LLInventoryCategoriesObserver*    mCategoriesObserver;
 
     LLAccordionCtrl*                mAccordion;
@@ -374,13 +432,15 @@ private:
     // Used to monitor COF changes for updating items worn state. See EXT-8636.
     uuid_vec_t                      mCOFLinkedItems;
 
-    //LLOutfitListGearMenu*         mGearMenu;
+    LLOutfitListSortMenu*         mSortMenu;
 
     //bool                          mIsInitialized;
     /**
      * True if there is a selection inside currently selected outfit
      */
     bool                            mItemSelected;
+
+    boost::signals2::connection                   mSavedSettingInvFavColor;
 };
 
 #endif //LL_LLOUTFITSLIST_H
diff --git a/indra/newview/llpanelappearancetab.h b/indra/newview/llpanelappearancetab.h
index e4d16582de..e088c3e6f0 100644
--- a/indra/newview/llpanelappearancetab.h
+++ b/indra/newview/llpanelappearancetab.h
@@ -29,6 +29,8 @@
 
 #include "llpanel.h"
 
+class LLToggleableMenu;
+
 class LLPanelAppearanceTab : public LLPanel
 {
 public:
@@ -47,6 +49,11 @@ public:
 
     const std::string& getFilterSubString() { return mFilterSubString; }
 
+    virtual void updateMenuItemsVisibility() = 0;
+    virtual LLToggleableMenu* getGearMenu() = 0;
+    virtual LLToggleableMenu* getSortMenu() = 0;
+    virtual bool getTrashMenuVisible() = 0;
+
 protected:
 
     /**
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 4ada9c445c..a24d6af033 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -482,10 +482,6 @@ LLPanelFace::~LLPanelFace()
 
 void LLPanelFace::onVisibilityChange(bool new_visibility)
 {
-    if (new_visibility)
-    {
-        gAgent.showLatestFeatureNotification("gltf");
-    }
     LLPanel::onVisibilityChange(new_visibility);
 }
 
@@ -3644,7 +3640,7 @@ void LLPanelFace::onCommitRepeatsPerMeter()
     bool identical_scale_t = false;
 
     LLSelectedTE::getObjectScaleS(obj_scale_s, identical_scale_s);
-    LLSelectedTE::getObjectScaleS(obj_scale_t, identical_scale_t);
+    LLSelectedTE::getObjectScaleT(obj_scale_t, identical_scale_t);
 
     if (gSavedSettings.getBOOL("SyncMaterialSettings"))
     {
@@ -5151,6 +5147,7 @@ void LLPanelFace::LLSelectedTEMaterial::getMaxSpecularRepeats(F32& repeats, bool
             LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
             U32 s_axis = VX;
             U32 t_axis = VY;
+            LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
             F32 repeats_s = 1.0f;
             F32 repeats_t = 1.0f;
             if (mat)
@@ -5175,6 +5172,7 @@ void LLPanelFace::LLSelectedTEMaterial::getMaxNormalRepeats(F32& repeats, bool&
             LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
             U32 s_axis = VX;
             U32 t_axis = VY;
+            LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
             F32 repeats_s = 1.0f;
             F32 repeats_t = 1.0f;
             if (mat)
diff --git a/indra/newview/llpanelgroupcreate.cpp b/indra/newview/llpanelgroupcreate.cpp
index 4a370525ff..bc7b5caddf 100644
--- a/indra/newview/llpanelgroupcreate.cpp
+++ b/indra/newview/llpanelgroupcreate.cpp
@@ -85,6 +85,7 @@ bool LLPanelGroupCreate::postBuild()
 
     mInsignia = getChild<LLTextureCtrl>("insignia", true);
     mInsignia->setAllowLocalTexture(false);
+    mInsignia->setBakeTextureEnabled(false);
     mInsignia->setCanApplyImmediately(false);
 
     return true;
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 0c331b4cec..38ae818910 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -211,6 +211,7 @@ void LLPanelGroupGeneral::setupCtrls(LLPanel* panel_group)
     {
         mInsignia->setCommitCallback(onCommitAny, this);
         mInsignia->setAllowLocalTexture(false);
+        mInsignia->setBakeTextureEnabled(false);
     }
     mFounderName = getChild<LLTextBox>("founder_name");
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index d964fa9170..3083bffdd4 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -68,6 +68,7 @@ const std::string FILTERS_FILENAME("filters.xml");
 const std::string ALL_ITEMS("All Items");
 const std::string RECENT_ITEMS("Recent Items");
 const std::string WORN_ITEMS("Worn Items");
+const std::string FAVORITES("Favorites");
 
 static LLPanelInjector<LLPanelMainInventory> t_inventory("panel_main_inventory");
 
@@ -196,6 +197,17 @@ bool LLPanelMainInventory::postBuild()
         worn_filter.markDefault();
         mWornItemsPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mWornItemsPanel, _1, _2));
     }
+
+    LLInventoryPanel* favorites_panel = getChild<LLInventoryPanel>(FAVORITES);
+    if (favorites_panel)
+    {
+        favorites_panel->setSortOrder(gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER));
+        LLInventoryFilter& favorites_filter = favorites_panel->getFilter();
+        favorites_filter.setEmptyLookupMessage("InventoryNoMatchingFavorites");
+        favorites_filter.markDefault();
+        favorites_panel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, favorites_panel, _1, _2));
+    }
+
     mSearchTypeCombo  = getChild<LLComboBox>("search_type");
     if(mSearchTypeCombo)
     {
@@ -560,7 +572,8 @@ void LLPanelMainInventory::doCreate(const LLSD& userdata)
     }
     else
     {
-        menu_create_inventory_item(getPanel(), NULL, userdata);
+        selectAllItemsPanel();
+        menu_create_inventory_item(mAllItemsPanel, NULL, userdata);
     }
 }
 
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index ef7986603b..f90d6d5b3f 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -129,6 +129,7 @@ public:
     virtual void navigateToFolder(bool new_window = false, bool change_mode = false) {}
     virtual bool isItemRenameable() const;
     virtual bool renameItem(const std::string& new_name);
+    virtual bool isFavorite() const { return false; }
     virtual bool isItemMovable() const;
     virtual bool isItemRemovable(bool check_worn = true) const;
     virtual bool removeItem();
@@ -1364,7 +1365,23 @@ bool LLPanelObjectInventory::postBuild()
 
 void LLPanelObjectInventory::doToSelected(const LLSD& userdata)
 {
-    LLInventoryAction::doToSelected(&gInventory, mFolders, userdata.asString());
+    std::string action = userdata.asString();
+    if ("rename" == action || "delete" == action)
+    {
+        LLViewerObject* objectp = gObjectList.findObject(mTaskUUID);
+        if (objectp && !objectp->permModify())
+        {
+            LLNotificationsUtil::add("CantModifyContentInNoModTask");
+        }
+        else
+        {
+            LLInventoryAction::doToSelected(&gInventory, mFolders, action);
+        }
+    }
+    else
+    {
+        LLInventoryAction::doToSelected(&gInventory, mFolders, action);
+    }
 }
 
 void LLPanelObjectInventory::clearContents()
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 4cd4afaa5a..a9e860d2ef 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -404,7 +404,9 @@ LLPanelOutfitEdit::LLPanelOutfitEdit()
     mWearableListManager(NULL),
     mPlusBtn(NULL),
     mWearablesGearMenuBtn(NULL),
-    mGearMenuBtn(NULL)
+    mGearMenuBtn(NULL),
+    mStatus(NULL),
+    mCurrentOutfitName(NULL)
 {
     mSavedFolderState = new LLSaveFolderState();
     mSavedFolderState->setApply(false);
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 47c02793a3..e2e2cf1a61 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -33,6 +33,7 @@
 #include "llfloatersidepanelcontainer.h"
 #include "llinventoryfunctions.h"
 #include "llinventorymodelbackgroundfetch.h"
+#include "llmenubutton.h"
 #include "llnotificationsutil.h"
 #include "lloutfitgallery.h"
 #include "lloutfitobserver.h"
@@ -53,12 +54,17 @@ static const std::string SAVE_BTN("save_btn");
 
 static LLPanelInjector<LLPanelOutfitsInventory> t_inventory("panel_outfits_inventory");
 
-LLPanelOutfitsInventory::LLPanelOutfitsInventory() :
-    mMyOutfitsPanel(NULL),
-    mCurrentOutfitPanel(NULL),
-    mActivePanel(NULL),
-    mAppearanceTabs(NULL),
-    mInitialized(false)
+LLPanelOutfitsInventory::LLPanelOutfitsInventory()
+    : mMyOutfitsPanel(nullptr)
+    , mCurrentOutfitPanel(nullptr)
+    , mActivePanel(nullptr)
+    , mAppearanceTabs(nullptr)
+    , mInitialized(false)
+    , mGearMenu(nullptr)
+    , mSortMenu(nullptr)
+    , mTrashBtn(nullptr)
+    , mSortMenuPanel(nullptr)
+    , mTrashMenuPanel(nullptr)
 {
     gAgentWearables.addLoadedCallback(boost::bind(&LLPanelOutfitsInventory::onWearablesLoaded, this));
     gAgentWearables.addLoadingStartedCallback(boost::bind(&LLPanelOutfitsInventory::onWearablesLoading, this));
@@ -75,6 +81,9 @@ LLPanelOutfitsInventory::~LLPanelOutfitsInventory()
     {
         gSavedSettings.setS32("LastAppearanceTab", mAppearanceTabs->getCurrentPanelIndex());
     }
+    mGearMenuConnection.disconnect();
+    mSortMenuConnection.disconnect();
+    mTrashMenuConnection.disconnect();
 }
 
 // virtual
@@ -258,6 +267,22 @@ void LLPanelOutfitsInventory::initListCommandsHandlers()
     mOutfitGalleryPanel->childSetAction("trash_btn", boost::bind(&LLPanelOutfitsInventory::onTrashButtonClick, this));
 }
 
+void LLPanelOutfitsInventory::setMenuButtons(LLMenuButton* gear_menu, LLMenuButton* sort_menu, LLButton* trash_btn, LLPanel* sort_menu_panel, LLPanel* trash_menu_panel)
+{
+    mGearMenu = gear_menu;
+    mSortMenu = sort_menu;
+    mTrashBtn = trash_btn;
+    mSortMenuPanel = sort_menu_panel;
+    mTrashMenuPanel = trash_menu_panel;
+
+    mGearMenuConnection.disconnect();
+    mSortMenuConnection.disconnect();
+    mTrashMenuConnection.disconnect();
+    mGearMenuConnection = mGearMenu->setMouseDownCallback(boost::bind(&LLPanelOutfitsInventory::onGearMouseDown, this));
+    mSortMenuConnection = mSortMenu->setMouseDownCallback(boost::bind(&LLPanelOutfitsInventory::onGearMouseDown, this));
+    mTrashMenuConnection = mTrashBtn->setClickedCallback(boost::bind(&LLPanelOutfitsInventory::onTrashButtonClick, this));
+}
+
 void LLPanelOutfitsInventory::updateListCommands()
 {
     bool trash_enabled = isActionEnabled("delete");
@@ -284,6 +309,14 @@ void LLPanelOutfitsInventory::onTrashButtonClick()
     }
 }
 
+void LLPanelOutfitsInventory::onGearMouseDown()
+{
+    if (mActivePanel)
+    {
+        mActivePanel->updateMenuItemsVisibility();
+    }
+}
+
 bool LLPanelOutfitsInventory::isActionEnabled(const LLSD& userdata)
 {
     return mActivePanel && mActivePanel->isActionEnabled(userdata);
@@ -320,6 +353,28 @@ void LLPanelOutfitsInventory::onTabChange()
     mActivePanel->checkFilterSubString();
     mActivePanel->onOpen(LLSD());
 
+    if (mGearMenu)
+    {
+        mGearMenu->setMenu(mActivePanel->getGearMenu(), LLMenuButton::MP_BOTTOM_LEFT);
+    }
+    if (mSortMenu && mSortMenuPanel)
+    {
+        LLToggleableMenu* menu = mActivePanel->getSortMenu();
+        if (menu)
+        {
+            mSortMenu->setMenu(menu, LLMenuButton::MP_BOTTOM_LEFT);
+            mSortMenuPanel->setVisible(true);
+        }
+        else
+        {
+            mSortMenuPanel->setVisible(false);
+        }
+    }
+    if (mTrashMenuPanel)
+    {
+        mTrashMenuPanel->setVisible(mActivePanel->getTrashMenuVisible());
+    }
+
     updateVerbs();
 }
 
diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
index e046681e95..29f7eb44f7 100644
--- a/indra/newview/llpaneloutfitsinventory.h
+++ b/indra/newview/llpaneloutfitsinventory.h
@@ -30,11 +30,13 @@
 
 #include "llpanel.h"
 
+class LLButton;
 class LLOutfitGallery;
 class LLOutfitsList;
 class LLOutfitListGearMenuBase;
 class LLPanelAppearanceTab;
 class LLPanelWearing;
+class LLMenuButton;
 class LLMenuGL;
 class LLSidepanelAppearance;
 class LLTabContainer;
@@ -63,6 +65,13 @@ public:
 
     bool isCOFPanelActive() const;
 
+    void setMenuButtons(
+        LLMenuButton* gear_menu,
+        LLMenuButton* sort_menu,
+        LLButton* trash_btn,
+        LLPanel* sort_menu_panel,
+        LLPanel* trash_menu_panel);
+
 protected:
     void updateVerbs();
 
@@ -92,20 +101,29 @@ protected:
     void initListCommandsHandlers();
     void updateListCommands();
     void onWearButtonClick();
-    void showGearMenu();
     void onTrashButtonClick();
+    void onGearMouseDown();
     bool isActionEnabled(const LLSD& userdata);
     void setWearablesLoading(bool val);
     void onWearablesLoaded();
     void onWearablesLoading();
 private:
     LLPanel*                    mListCommands;
-    LLMenuGL*                   mMenuAdd;
     LLButton*                   mWearBtn = nullptr;
     // List Commands                                                                //
     //////////////////////////////////////////////////////////////////////////////////
 
     bool mInitialized;
+
+    // not owned items
+    LLMenuButton* mGearMenu;
+    LLMenuButton* mSortMenu;
+    LLButton* mTrashBtn;
+    LLPanel* mSortMenuPanel;
+    LLPanel* mTrashMenuPanel;
+    boost::signals2::connection mGearMenuConnection;
+    boost::signals2::connection mSortMenuConnection;
+    boost::signals2::connection mTrashMenuConnection;
 };
 
 #endif //LL_LLPANELOUTFITSINVENTORY_H
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index 04b8af49c1..6966cb38ab 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -351,7 +351,10 @@ void PeopleContextMenu::eject()
             avatar = (LLVOAvatar*) object;
         }
     }
-    if (!avatar) return;
+
+    if (!avatar)
+        return;
+
     LLSD payload;
     payload["avatar_id"] = avatar->getID();
     std::string fullname = avatar->getFullname();
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 0ce1f0f9d3..891896076a 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -176,7 +176,7 @@ bool LLPanelPermissions::postBuild()
 
     childSetCommitCallback("sale type",LLPanelPermissions::onCommitSaleType,this);
 
-    childSetCommitCallback("Edit Cost", LLPanelPermissions::onCommitSaleInfo, this);
+    childSetCommitCallback("Edit Cost", LLPanelPermissions::onCommitSalePrice, this);
 
     childSetCommitCallback("checkbox next owner can modify",LLPanelPermissions::onCommitNextOwnerModify,this);
     childSetCommitCallback("checkbox next owner can copy",LLPanelPermissions::onCommitNextOwnerCopy,this);
@@ -781,7 +781,9 @@ void LLPanelPermissions::refresh()
 
     if (has_change_sale_ability && (owner_mask_on & PERM_TRANSFER))
     {
-        getChildView("checkbox for sale")->setEnabled(can_transfer || (!can_transfer && num_for_sale));
+        bool change_sale_allowed = can_transfer || (!can_transfer && num_for_sale);
+        getChildView("checkbox for sale")->setEnabled(change_sale_allowed);
+        getChildView("Edit Cost")->setEnabled(change_sale_allowed && !is_for_sale_mixed);
         // Set the checkbox to tentative if the prices of each object selected
         // are not the same.
         getChild<LLUICtrl>("checkbox for sale")->setTentative(              is_for_sale_mixed);
@@ -1223,6 +1225,16 @@ void LLPanelPermissions::onCommitSaleType(LLUICtrl*, void* data)
     self->setAllSaleInfo();
 }
 
+void LLPanelPermissions::onCommitSalePrice(LLUICtrl *, void *data)
+{
+    LLPanelPermissions *self = (LLPanelPermissions *) data;
+    LLCheckBoxCtrl *checkPurchase = self->getChild<LLCheckBoxCtrl>("checkbox for sale");
+    if (checkPurchase && checkPurchase->get())
+    {
+        self->setAllSaleInfo();
+    }
+}
+
 void LLPanelPermissions::setAllSaleInfo()
 {
     LL_INFOS() << "LLPanelPermissions::setAllSaleInfo()" << LL_ENDL;
diff --git a/indra/newview/llpanelpermissions.h b/indra/newview/llpanelpermissions.h
index 77129434ed..12e88361c9 100644
--- a/indra/newview/llpanelpermissions.h
+++ b/indra/newview/llpanelpermissions.h
@@ -77,6 +77,7 @@ protected:
 
     static void onCommitSaleInfo(LLUICtrl* ctrl, void* data);
     static void onCommitSaleType(LLUICtrl* ctrl, void* data);
+    static void onCommitSalePrice(LLUICtrl *ctrl, void *data);
     void setAllSaleInfo();
 
     static void onCommitClickAction(LLUICtrl* ctrl, void*);
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 7b562337a3..b1c8b5f36a 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -777,7 +777,7 @@ void LLPanelPrimMediaControls::draw()
     else if(mFadeTimer.getStarted())
     {
         F32 time = mFadeTimer.getElapsedTimeF32();
-        alpha *= llmax(lerp(1.0f, 0.0f, time / mControlFadeTime), 0.0f);
+        alpha *= llmax(lerp(1.f, 0.f, time / mControlFadeTime), 0.0f);
 
         if(time >= mControlFadeTime)
         {
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 132098ba99..cc418b6374 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -2071,6 +2071,7 @@ void LLPanelProfileFirstLife::onChangePhoto()
                 }
             });
             texture_floaterp->setLocalTextureEnabled(false);
+            texture_floaterp->setBakeTextureEnabled(false);
             texture_floaterp->setCanApply(false, true, false);
 
             parent_floater->addDependentFloater(mFloaterTexturePickerHandle);
diff --git a/indra/newview/llpanelprofileclassifieds.h b/indra/newview/llpanelprofileclassifieds.h
index 42cd5f8975..2e6b7c4428 100644
--- a/indra/newview/llpanelprofileclassifieds.h
+++ b/indra/newview/llpanelprofileclassifieds.h
@@ -157,17 +157,17 @@ public:
 
     void setParcelId(const LLUUID& id) { mParcelId = id; }
 
-    LLUUID getParcelId() { return mParcelId; }
+    LLUUID getParcelId() const { return mParcelId; }
 
     void setSimName(const std::string& sim_name) { mSimName = sim_name; }
 
-    std::string getSimName() { return mSimName; }
+    std::string getSimName() const { return mSimName; }
 
     void setFromSearch(bool val) { mFromSearch = val; }
 
-    bool fromSearch() { return mFromSearch; }
+    bool fromSearch() const { return mFromSearch; }
 
-    bool getInfoLoaded() { return mInfoLoaded; }
+    bool getInfoLoaded() const { return mInfoLoaded; }
 
     void setInfoLoaded(bool loaded) { mInfoLoaded = loaded; }
 
@@ -175,9 +175,9 @@ public:
 
     void resetDirty() override;
 
-    bool isNew() { return mIsNew; }
+    bool isNew() const { return mIsNew; }
 
-    bool isNewWithErrors() { return mIsNewWithErrors; }
+    bool isNewWithErrors() const { return mIsNewWithErrors; }
 
     bool canClose();
 
@@ -191,10 +191,10 @@ public:
 
     bool getAutoRenew();
 
-    S32 getPriceForListing() { return mPriceForListing; }
+    S32 getPriceForListing() const { return mPriceForListing; }
 
     void setEditMode(bool edit_mode);
-    bool getEditMode() {return mEditMode;}
+    bool getEditMode() const { return mEditMode; }
 
     static void setClickThrough(
         const LLUUID& classified_id,
diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp
index 32c9f6f402..56c0294dbe 100644
--- a/indra/newview/llpanelsnapshot.cpp
+++ b/indra/newview/llpanelsnapshot.cpp
@@ -37,6 +37,7 @@
 
 // newview
 #include "llsidetraypanelcontainer.h"
+#include "llsnapshotlivepreview.h"
 #include "llviewercontrol.h" // gSavedSettings
 
 #include "llagentbenefits.h"
@@ -99,6 +100,17 @@ void LLPanelSnapshot::onOpen(const LLSD& key)
     {
         getParentByType<LLFloater>()->notify(LLSD().with("image-format-change", true));
     }
+
+    // If resolution is set to "Current Window", force a snapshot update
+    // each time a snapshot panel is opened to determine the correct
+    // image size (and upload fee) depending on the snapshot type.
+    if (mSnapshotFloater && getChild<LLUICtrl>(getImageSizeComboName())->getValue().asString() == "[i0,i0]")
+    {
+        if (LLSnapshotLivePreview* preview = mSnapshotFloater->getPreviewView())
+        {
+            preview->mForceUpdateSnapshot = true;
+        }
+    }
 }
 
 LLSnapshotModel::ESnapshotFormat LLPanelSnapshot::getImageFormat() const
diff --git a/indra/newview/llpanelsnapshotinventory.cpp b/indra/newview/llpanelsnapshotinventory.cpp
index 96b17acc40..b81b891685 100644
--- a/indra/newview/llpanelsnapshotinventory.cpp
+++ b/indra/newview/llpanelsnapshotinventory.cpp
@@ -42,77 +42,35 @@
 /**
  * The panel provides UI for saving snapshot as an inventory texture.
  */
-class LLPanelSnapshotInventoryBase
-    : public LLPanelSnapshot
-{
-    LOG_CLASS(LLPanelSnapshotInventoryBase);
-
-public:
-    LLPanelSnapshotInventoryBase();
-
-    /*virtual*/ bool postBuild();
-protected:
-    void onSend();
-    /*virtual*/ LLSnapshotModel::ESnapshotType getSnapshotType();
-};
-
 class LLPanelSnapshotInventory
-    : public LLPanelSnapshotInventoryBase
+    : public LLPanelSnapshot
 {
     LOG_CLASS(LLPanelSnapshotInventory);
 
 public:
     LLPanelSnapshotInventory();
-    /*virtual*/ bool postBuild();
-    /*virtual*/ void onOpen(const LLSD& key);
+    bool postBuild() override;
+    void onOpen(const LLSD& key) override;
 
     void onResolutionCommit(LLUICtrl* ctrl);
 
 private:
-    /*virtual*/ std::string getWidthSpinnerName() const     { return "inventory_snapshot_width"; }
-    /*virtual*/ std::string getHeightSpinnerName() const    { return "inventory_snapshot_height"; }
-    /*virtual*/ std::string getAspectRatioCBName() const    { return "inventory_keep_aspect_check"; }
-    /*virtual*/ std::string getImageSizeComboName() const   { return "texture_size_combo"; }
-    /*virtual*/ std::string getImageSizePanelName() const   { return LLStringUtil::null; }
-    /*virtual*/ void updateControls(const LLSD& info);
-
-};
-
-class LLPanelOutfitSnapshotInventory
-    : public LLPanelSnapshotInventoryBase
-{
-    LOG_CLASS(LLPanelOutfitSnapshotInventory);
-
-public:
-    LLPanelOutfitSnapshotInventory();
-        /*virtual*/ bool postBuild();
-        /*virtual*/ void onOpen(const LLSD& key);
+    std::string getWidthSpinnerName() const override   { return "inventory_snapshot_width"; }
+    std::string getHeightSpinnerName() const override  { return "inventory_snapshot_height"; }
+    std::string getAspectRatioCBName() const override  { return "inventory_keep_aspect_check"; }
+    std::string getImageSizeComboName() const override { return "texture_size_combo"; }
+    std::string getImageSizePanelName() const override { return LLStringUtil::null; }
+    LLSnapshotModel::ESnapshotType getSnapshotType() override;
+    void updateControls(const LLSD& info) override;
 
-private:
-    /*virtual*/ std::string getWidthSpinnerName() const     { return ""; }
-    /*virtual*/ std::string getHeightSpinnerName() const    { return ""; }
-    /*virtual*/ std::string getAspectRatioCBName() const    { return ""; }
-    /*virtual*/ std::string getImageSizeComboName() const   { return "texture_size_combo"; }
-    /*virtual*/ std::string getImageSizePanelName() const   { return LLStringUtil::null; }
-    /*virtual*/ void updateControls(const LLSD& info);
-
-    /*virtual*/ void cancel();
+    void onSend();
+    void updateUploadCost();
+    S32 calculateUploadCost();
 };
 
 static LLPanelInjector<LLPanelSnapshotInventory> panel_class1("llpanelsnapshotinventory");
 
-static LLPanelInjector<LLPanelOutfitSnapshotInventory> panel_class2("llpaneloutfitsnapshotinventory");
-
-LLPanelSnapshotInventoryBase::LLPanelSnapshotInventoryBase()
-{
-}
-
-bool LLPanelSnapshotInventoryBase::postBuild()
-{
-    return LLPanelSnapshot::postBuild();
-}
-
-LLSnapshotModel::ESnapshotType LLPanelSnapshotInventoryBase::getSnapshotType()
+LLSnapshotModel::ESnapshotType LLPanelSnapshotInventory::getSnapshotType()
 {
     return LLSnapshotModel::SNAPSHOT_TEXTURE;
 }
@@ -130,12 +88,14 @@ bool LLPanelSnapshotInventory::postBuild()
     getChild<LLSpinCtrl>(getHeightSpinnerName())->setAllowEdit(false);
 
     getChild<LLUICtrl>(getImageSizeComboName())->setCommitCallback(boost::bind(&LLPanelSnapshotInventory::onResolutionCommit, this, _1));
-    return LLPanelSnapshotInventoryBase::postBuild();
+    return LLPanelSnapshot::postBuild();
 }
 
 // virtual
 void LLPanelSnapshotInventory::onOpen(const LLSD& key)
 {
+    updateUploadCost();
+
     LLPanelSnapshot::onOpen(key);
 }
 
@@ -144,6 +104,8 @@ void LLPanelSnapshotInventory::updateControls(const LLSD& info)
 {
     const bool have_snapshot = info.has("have-snapshot") ? info["have-snapshot"].asBoolean() : true;
     getChild<LLUICtrl>("save_btn")->setEnabled(have_snapshot);
+
+    updateUploadCost();
 }
 
 void LLPanelSnapshotInventory::onResolutionCommit(LLUICtrl* ctrl)
@@ -153,21 +115,9 @@ void LLPanelSnapshotInventory::onResolutionCommit(LLUICtrl* ctrl)
     getChild<LLSpinCtrl>(getHeightSpinnerName())->setVisible(!current_window_selected);
 }
 
-void LLPanelSnapshotInventoryBase::onSend()
+void LLPanelSnapshotInventory::onSend()
 {
-    S32 w = 0;
-    S32 h = 0;
-
-    if( mSnapshotFloater )
-    {
-        LLSnapshotLivePreview* preview = mSnapshotFloater->getPreviewView();
-        if( preview )
-        {
-            preview->getSize(w, h);
-        }
-    }
-
-    S32 expected_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(w, h);
+    S32 expected_upload_cost = calculateUploadCost();
     if (can_afford_transaction(expected_upload_cost))
     {
         if (mSnapshotFloater)
@@ -188,36 +138,24 @@ void LLPanelSnapshotInventoryBase::onSend()
     }
 }
 
-LLPanelOutfitSnapshotInventory::LLPanelOutfitSnapshotInventory()
+void LLPanelSnapshotInventory::updateUploadCost()
 {
-    mCommitCallbackRegistrar.add("Inventory.SaveOutfitPhoto", boost::bind(&LLPanelOutfitSnapshotInventory::onSend, this));
-    mCommitCallbackRegistrar.add("Inventory.SaveOutfitCancel", boost::bind(&LLPanelOutfitSnapshotInventory::cancel, this));
+    getChild<LLUICtrl>("hint_lbl")->setTextArg("[UPLOAD_COST]", llformat("%d", calculateUploadCost()));
 }
 
-// virtual
-bool LLPanelOutfitSnapshotInventory::postBuild()
+S32 LLPanelSnapshotInventory::calculateUploadCost()
 {
-    return LLPanelSnapshotInventoryBase::postBuild();
-}
-
-// virtual
-void LLPanelOutfitSnapshotInventory::onOpen(const LLSD& key)
-{
-    getChild<LLUICtrl>("hint_lbl")->setTextArg("[UPLOAD_COST]", llformat("%d", LLAgentBenefitsMgr::current().getTextureUploadCost()));
-    LLPanelSnapshot::onOpen(key);
-}
-
-// virtual
-void LLPanelOutfitSnapshotInventory::updateControls(const LLSD& info)
-{
-    const bool have_snapshot = info.has("have-snapshot") ? info["have-snapshot"].asBoolean() : true;
-    getChild<LLUICtrl>("save_btn")->setEnabled(have_snapshot);
-}
+    S32 w = 0;
+    S32 h = 0;
 
-void LLPanelOutfitSnapshotInventory::cancel()
-{
     if (mSnapshotFloater)
     {
-        mSnapshotFloater->closeFloater();
+        if (LLSnapshotLivePreview* preview = mSnapshotFloater->getPreviewView())
+        {
+            w = preview->getEncodedImageWidth();
+            h = preview->getEncodedImageHeight();
+        }
     }
+
+    return LLAgentBenefitsMgr::current().getTextureUploadCost(w, h);
 }
diff --git a/indra/newview/llpanelsnapshotlocal.cpp b/indra/newview/llpanelsnapshotlocal.cpp
index 366030c0fa..57759fbcaa 100644
--- a/indra/newview/llpanelsnapshotlocal.cpp
+++ b/indra/newview/llpanelsnapshotlocal.cpp
@@ -47,18 +47,18 @@ class LLPanelSnapshotLocal
 
 public:
     LLPanelSnapshotLocal();
-    /*virtual*/ bool postBuild();
-    /*virtual*/ void onOpen(const LLSD& key);
+    bool postBuild() override;
+    void onOpen(const LLSD& key) override;
 
 private:
-    /*virtual*/ std::string getWidthSpinnerName() const     { return "local_snapshot_width"; }
-    /*virtual*/ std::string getHeightSpinnerName() const    { return "local_snapshot_height"; }
-    /*virtual*/ std::string getAspectRatioCBName() const    { return "local_keep_aspect_check"; }
-    /*virtual*/ std::string getImageSizeComboName() const   { return "local_size_combo"; }
-    /*virtual*/ std::string getImageSizePanelName() const   { return "local_image_size_lp"; }
-    /*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const;
-    /*virtual*/ LLSnapshotModel::ESnapshotType getSnapshotType();
-    /*virtual*/ void updateControls(const LLSD& info);
+    std::string getWidthSpinnerName() const  override  { return "local_snapshot_width"; }
+    std::string getHeightSpinnerName() const override  { return "local_snapshot_height"; }
+    std::string getAspectRatioCBName() const override  { return "local_keep_aspect_check"; }
+    std::string getImageSizeComboName() const override { return "local_size_combo"; }
+    std::string getImageSizePanelName() const override { return "local_image_size_lp"; }
+    LLSnapshotModel::ESnapshotFormat getImageFormat() const override;
+    LLSnapshotModel::ESnapshotType getSnapshotType() override;
+    void updateControls(const LLSD& info) override;
 
     S32 mLocalFormat;
 
diff --git a/indra/newview/llpanelsnapshotoptions.cpp b/indra/newview/llpanelsnapshotoptions.cpp
index 962d3bba16..05cd9e7b3a 100644
--- a/indra/newview/llpanelsnapshotoptions.cpp
+++ b/indra/newview/llpanelsnapshotoptions.cpp
@@ -30,12 +30,8 @@
 #include "llsidetraypanelcontainer.h"
 
 #include "llfloatersnapshot.h" // FIXME: create a snapshot model
-#include "llsnapshotlivepreview.h"
 #include "llfloaterreg.h"
 
-#include "llagentbenefits.h"
-
-
 /**
  * Provides several ways to save a snapshot.
  */
@@ -46,12 +42,9 @@ class LLPanelSnapshotOptions
 
 public:
     LLPanelSnapshotOptions();
-    ~LLPanelSnapshotOptions();
-    /*virtual*/ bool postBuild();
-    /*virtual*/ void onOpen(const LLSD& key);
+    bool postBuild() override;
 
 private:
-    void updateUploadCost();
     void openPanel(const std::string& panel_name);
     void onSaveToProfile();
     void onSaveToEmail();
@@ -71,10 +64,6 @@ LLPanelSnapshotOptions::LLPanelSnapshotOptions()
     mCommitCallbackRegistrar.add("Snapshot.SaveToComputer",     boost::bind(&LLPanelSnapshotOptions::onSaveToComputer,  this));
 }
 
-LLPanelSnapshotOptions::~LLPanelSnapshotOptions()
-{
-}
-
 // virtual
 bool LLPanelSnapshotOptions::postBuild()
 {
@@ -82,30 +71,6 @@ bool LLPanelSnapshotOptions::postBuild()
     return LLPanel::postBuild();
 }
 
-// virtual
-void LLPanelSnapshotOptions::onOpen(const LLSD& key)
-{
-    updateUploadCost();
-}
-
-void LLPanelSnapshotOptions::updateUploadCost()
-{
-    S32 w = 0;
-    S32 h = 0;
-
-    if( mSnapshotFloater )
-    {
-        LLSnapshotLivePreview* preview = mSnapshotFloater->getPreviewView();
-        if( preview )
-        {
-            preview->getSize(w, h);
-        }
-    }
-
-    S32 upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost(w, h);
-    getChild<LLUICtrl>("save_to_inventory_btn")->setLabelArg("[AMOUNT]", llformat("%d", upload_cost));
-}
-
 void LLPanelSnapshotOptions::openPanel(const std::string& panel_name)
 {
     LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());
diff --git a/indra/newview/llpanelsnapshotpostcard.cpp b/indra/newview/llpanelsnapshotpostcard.cpp
index 23e8789e3f..f3dfdc9250 100644
--- a/indra/newview/llpanelsnapshotpostcard.cpp
+++ b/indra/newview/llpanelsnapshotpostcard.cpp
@@ -56,18 +56,18 @@ class LLPanelSnapshotPostcard
 
 public:
     LLPanelSnapshotPostcard();
-    /*virtual*/ bool postBuild();
-    /*virtual*/ void onOpen(const LLSD& key);
+    bool postBuild() override;
+    void onOpen(const LLSD& key) override;
 
 private:
-    /*virtual*/ std::string getWidthSpinnerName() const     { return "postcard_snapshot_width"; }
-    /*virtual*/ std::string getHeightSpinnerName() const    { return "postcard_snapshot_height"; }
-    /*virtual*/ std::string getAspectRatioCBName() const    { return "postcard_keep_aspect_check"; }
-    /*virtual*/ std::string getImageSizeComboName() const   { return "postcard_size_combo"; }
-    /*virtual*/ std::string getImageSizePanelName() const   { return "postcard_image_size_lp"; }
-    /*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const { return LLSnapshotModel::SNAPSHOT_FORMAT_JPEG; }
-    /*virtual*/ LLSnapshotModel::ESnapshotType getSnapshotType();
-    /*virtual*/ void updateControls(const LLSD& info);
+    std::string getWidthSpinnerName() const override   { return "postcard_snapshot_width"; }
+    std::string getHeightSpinnerName() const override  { return "postcard_snapshot_height"; }
+    std::string getAspectRatioCBName() const override  { return "postcard_keep_aspect_check"; }
+    std::string getImageSizeComboName() const override { return "postcard_size_combo"; }
+    std::string getImageSizePanelName() const override { return "postcard_image_size_lp"; }
+    LLSnapshotModel::ESnapshotFormat getImageFormat() const override { return LLSnapshotModel::SNAPSHOT_FORMAT_JPEG; }
+    LLSnapshotModel::ESnapshotType getSnapshotType() override;
+    void updateControls(const LLSD& info) override;
 
     bool missingSubjMsgAlertCallback(const LLSD& notification, const LLSD& response);
     static void sendPostcardFinished(LLSD result);
diff --git a/indra/newview/llpanelsnapshotprofile.cpp b/indra/newview/llpanelsnapshotprofile.cpp
index aa257dea9e..b533d7bbbc 100644
--- a/indra/newview/llpanelsnapshotprofile.cpp
+++ b/indra/newview/llpanelsnapshotprofile.cpp
@@ -49,17 +49,17 @@ class LLPanelSnapshotProfile
 public:
     LLPanelSnapshotProfile();
 
-    /*virtual*/ bool postBuild();
-    /*virtual*/ void onOpen(const LLSD& key);
+    bool postBuild() override;
+    void onOpen(const LLSD& key) override;
 
 private:
-    /*virtual*/ std::string getWidthSpinnerName() const     { return "profile_snapshot_width"; }
-    /*virtual*/ std::string getHeightSpinnerName() const    { return "profile_snapshot_height"; }
-    /*virtual*/ std::string getAspectRatioCBName() const    { return "profile_keep_aspect_check"; }
-    /*virtual*/ std::string getImageSizeComboName() const   { return "profile_size_combo"; }
-    /*virtual*/ std::string getImageSizePanelName() const   { return "profile_image_size_lp"; }
-    /*virtual*/ LLSnapshotModel::ESnapshotFormat getImageFormat() const { return LLSnapshotModel::SNAPSHOT_FORMAT_PNG; }
-    /*virtual*/ void updateControls(const LLSD& info);
+    std::string getWidthSpinnerName() const override   { return "profile_snapshot_width"; }
+    std::string getHeightSpinnerName() const override  { return "profile_snapshot_height"; }
+    std::string getAspectRatioCBName() const override  { return "profile_keep_aspect_check"; }
+    std::string getImageSizeComboName() const override { return "profile_size_combo"; }
+    std::string getImageSizePanelName() const override { return "profile_image_size_lp"; }
+    LLSnapshotModel::ESnapshotFormat getImageFormat() const override { return LLSnapshotModel::SNAPSHOT_FORMAT_PNG; }
+    void updateControls(const LLSD& info) override;
 
     void onSend();
 };
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index c1534c9abd..3aedde74c6 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -113,6 +113,7 @@ protected:
                       boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), mUUIDs, no_op));
         registrar.add("Wearing.Detach",
                       boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), mUUIDs, no_op));
+        registrar.add("Wearing.Favorite", boost::bind(toggle_favorites, mUUIDs));
         LLContextMenu* menu = createFromFile("menu_wearing_tab.xml");
 
         updateMenuItemsVisibility(menu);
@@ -125,6 +126,8 @@ protected:
         bool bp_selected            = false;    // true if body parts selected
         bool clothes_selected       = false;
         bool attachments_selected   = false;
+        bool can_favorite = false;
+        bool can_unfavorite = false;
 
         // See what types of wearables are selected.
         for (uuid_vec_t::const_iterator it = mUUIDs.begin(); it != mUUIDs.end(); ++it)
@@ -137,6 +140,9 @@ protected:
                 continue;
             }
 
+            LLUUID linked_id = item->getLinkedUUID();
+            LLViewerInventoryItem* linked_item = gInventory.getItem(linked_id);
+
             LLAssetType::EType type = item->getType();
             if (type == LLAssetType::AT_CLOTHING)
             {
@@ -150,6 +156,8 @@ protected:
             {
                 attachments_selected = true;
             }
+            can_favorite |= !linked_item->getIsFavorite();
+            can_unfavorite |= linked_item->getIsFavorite();
         }
 
         // Enable/disable some menu items depending on the selection.
@@ -166,6 +174,8 @@ protected:
         menu->setItemVisible("detach",      allow_detach);
         menu->setItemVisible("edit_outfit_separator", show_touch | show_edit | allow_take_off || allow_detach);
         menu->setItemVisible("show_original", mUUIDs.size() == 1);
+        menu->setItemVisible("favorites_add", can_favorite);
+        menu->setItemVisible("favorites_remove", can_unfavorite);
     }
 };
 
@@ -232,6 +242,10 @@ LLPanelWearing::~LLPanelWearing()
     {
         mAttachmentsChangedConnection.disconnect();
     }
+    if (mGearMenuConnection.connected())
+    {
+        mGearMenuConnection.disconnect();
+    }
 }
 
 bool LLPanelWearing::postBuild()
@@ -249,10 +263,6 @@ bool LLPanelWearing::postBuild()
     mTempItemsList->setFgUnselectedColor(LLColor4::white);
     mTempItemsList->setRightMouseDownCallback(boost::bind(&LLPanelWearing::onTempAttachmentsListRightClick, this, _1, _2, _3));
 
-    LLMenuButton* menu_gear_btn = getChild<LLMenuButton>("options_gear_btn");
-
-    menu_gear_btn->setMenu(mGearMenu->getMenu());
-
     return true;
 }
 
@@ -560,6 +570,16 @@ void LLPanelWearing::onRemoveAttachment()
     }
 }
 
+LLToggleableMenu* LLPanelWearing::getGearMenu()
+{
+    return mGearMenu->getMenu();
+}
+
+LLToggleableMenu* LLPanelWearing::getSortMenu()
+{
+    return NULL;
+}
+
 void LLPanelWearing::onRemoveItem()
 {
     if (mWearablesTab->isExpanded())
diff --git a/indra/newview/llpanelwearing.h b/indra/newview/llpanelwearing.h
index ea0787d0ef..aa80a3fc21 100644
--- a/indra/newview/llpanelwearing.h
+++ b/indra/newview/llpanelwearing.h
@@ -84,6 +84,11 @@ public:
     void onEditAttachment();
     void onRemoveAttachment();
 
+    void updateMenuItemsVisibility() {};
+    LLToggleableMenu* getGearMenu();
+    LLToggleableMenu* getSortMenu();
+    bool getTrashMenuVisible() { return false; }
+
 private:
     void onWearableItemsListRightClick(LLUICtrl* ctrl, S32 x, S32 y);
     void onTempAttachmentsListRightClick(LLUICtrl* ctrl, S32 x, S32 y);
@@ -93,6 +98,7 @@ private:
     LLWearableItemsList*            mCOFItemsList;
     LLScrollListCtrl*               mTempItemsList;
     LLWearingGearMenu*              mGearMenu;
+    boost::signals2::connection     mGearMenuConnection;
     LLListContextMenu*              mContextMenu;
     LLListContextMenu*              mAttachmentsMenu;
 
diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index 86291708b0..e5c84728fe 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -646,18 +646,17 @@ bool LLPhysicsMotion::onUpdate(F32 time)
             velocity_new_local = 0;
         }
 
-        // Check for NaN values.  A NaN value is detected if the variables doesn't equal itself.
-        // If NaN, then reset everything.
-        if ((mPosition_local != mPosition_local) ||
-            (mVelocity_local != mVelocity_local) ||
-            (position_new_local != position_new_local))
+        // Check for NaN values. If NaN, then reset everything.
+        if (llisnan(mPosition_local) ||
+            llisnan(mVelocity_local) ||
+            llisnan(position_new_local))
         {
-            position_new_local = 0;
-            mVelocity_local = 0;
-            mVelocityJoint_local = 0;
-            mAccelerationJoint_local = 0;
-            mPosition_local = 0;
-            mPosition_world = LLVector3(0,0,0);
+            position_new_local = 0.f;
+            mVelocity_local = 0.f;
+            mVelocityJoint_local = 0.f;
+            mAccelerationJoint_local = 0.f;
+            mPosition_local = 0.f;
+            mPosition_world = LLVector3(0.f,0.f,0.f);
         }
 
         const F32 position_new_local_clamped = llclamp(position_new_local,
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 02a4c7fb26..c2aa4925bd 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -703,9 +703,10 @@ void LLScriptEdCore::sync()
     }
 }
 
-bool LLScriptEdCore::hasChanged()
+bool LLScriptEdCore::hasChanged() const
 {
-    if (!mEditor) return false;
+    if (!mEditor)
+        return false;
 
     return ((!mEditor->isPristine() || mEnableSave) && mHasScriptData);
 }
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 70ee1a4274..0bbe540207 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -143,7 +143,7 @@ public:
     void            setItemRemoved(bool script_removed){mScriptRemoved = script_removed;};
 
     void            setAssetID( const LLUUID& asset_id){ mAssetID = asset_id; };
-    LLUUID          getAssetID() { return mAssetID; }
+    LLUUID          getAssetID() const { return mAssetID; }
 
     bool isFontSizeChecked(const LLSD &userdata);
     void onChangeFontSize(const LLSD &size_name);
@@ -155,7 +155,7 @@ public:
     void        onBtnDynamicHelp();
     void        onBtnUndoChanges();
 
-    bool        hasChanged();
+    bool        hasChanged() const;
 
     void selectFirstError();
 
@@ -211,7 +211,6 @@ class LLScriptEdContainer : public LLPreview
 
 public:
     LLScriptEdContainer(const LLSD& key);
-    LLScriptEdContainer(const LLSD& key, const bool live);
 
     bool handleKeyHere(KEY key, MASK mask);
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 1876cd3086..dfc592453a 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -252,6 +252,7 @@ LLSelectMgr::LLSelectMgr()
 LLSelectMgr::~LLSelectMgr()
 {
     clearSelections();
+    mSlectionLodModChangedConnection.disconnect();
 }
 
 void LLSelectMgr::clearSelections()
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 0dbdc133e3..f797ed9bd3 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -941,6 +941,7 @@ private:
     bool                    mForceSelection;
 
     std::vector<LLAnimPauseRequest> mPauseRequests;
+    boost::signals2::connection mSlectionLodModChangedConnection;
 };
 
 // *DEPRECATED: For callbacks or observers, use
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index c618483fc4..1d1b31d2a6 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -40,6 +40,7 @@
 #include "llfloaterworldmap.h"
 #include "llfolderviewmodel.h"
 #include "llloadingindicator.h"
+#include "llmenubutton.h"
 #include "lloutfitobserver.h"
 #include "llpaneleditwearable.h"
 #include "llpaneloutfitsinventory.h"
@@ -145,6 +146,14 @@ bool LLSidepanelAppearance::postBuild()
 
     setWearablesLoading(gAgentWearables.isCOFChangeInProgress());
 
+
+    LLMenuButton* menu_gear_btn = getChild<LLMenuButton>("options_gear_btn");
+    LLMenuButton* menu_sort_btn = getChild<LLMenuButton>("sorting_menu_btn");
+    LLButton* menu_trash_btn = getChild<LLButton>("trash_btn");
+    LLPanel* menu_sort_btn_panel = getChild<LLPanel>("options_sort_btn_panel");
+    LLPanel* menu_trash_btn_panel = getChild<LLPanel>("trash_btn_panel");
+    mPanelOutfitsInventory->setMenuButtons(menu_gear_btn, menu_sort_btn, menu_trash_btn, menu_sort_btn_panel, menu_trash_btn_panel);
+
     return true;
 }
 
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index fccf745a74..3d4b4fb9c1 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -56,6 +56,8 @@
 #include "llviewerregion.h"
 
 
+const char* const DEFAULT_DESC = "(No Description)";
+
 class PropertiesChangedCallback : public LLInventoryCallback
 {
 public:
@@ -128,6 +130,7 @@ LLSidepanelItemInfo::LLSidepanelItemInfo(const LLPanel::Params& p)
     , mUpdatePendingId(-1)
     , mIsDirty(false) /*Not ready*/
     , mParentFloater(NULL)
+    , mLabelItemDesc(NULL)
 {
     gInventory.addObserver(this);
     gIdleCallbacks.addFunction(&LLSidepanelItemInfo::onIdle, (void*)this);
@@ -158,10 +161,11 @@ bool LLSidepanelItemInfo::postBuild()
     mItemTypeIcon = getChild<LLIconCtrl>("item_type_icon");
     mLabelOwnerName = getChild<LLTextBox>("LabelOwnerName");
     mLabelCreatorName = getChild<LLTextBox>("LabelCreatorName");
+    mLabelItemDesc = getChild<LLTextEditor>("LabelItemDesc");
 
     getChild<LLLineEditor>("LabelItemName")->setPrevalidate(&LLTextValidate::validateASCIIPrintableNoPipe);
     getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onCommitName,this));
-    getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
+    mLabelItemDesc->setCommitCallback(boost::bind(&LLSidepanelItemInfo:: onCommitDescription, this));
     // Thumnail edition
     mChangeThumbnailBtn->setCommitCallback(boost::bind(&LLSidepanelItemInfo::onEditThumbnail, this));
     // acquired date
@@ -923,17 +927,22 @@ void LLSidepanelItemInfo::onCommitDescription()
     LLViewerInventoryItem* item = findItem();
     if(!item) return;
 
-    LLTextEditor* labelItemDesc = getChild<LLTextEditor>("LabelItemDesc");
-    if(!labelItemDesc)
+    if(!mLabelItemDesc)
+    {
+        return;
+    }
+    if (!gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE))
     {
         return;
     }
-    if((item->getDescription() != labelItemDesc->getText()) &&
-       (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE)))
+    std::string old_desc = item->getDescription();
+    std::string new_desc = mLabelItemDesc->getText();
+    if(old_desc != new_desc)
     {
+        mLabelItemDesc->setSelectAllOnFocusReceived(false);
         LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 
-        new_item->setDescription(labelItemDesc->getText());
+        new_item->setDescription(new_desc);
         onCommitChanges(new_item);
     }
 }
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index 718edc79d6..0895d3360c 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -46,6 +46,7 @@ class LLObjectInventoryObserver;
 class LLViewerObject;
 class LLPermissions;
 class LLTextBox;
+class LLTextEditor;
 
 class LLSidepanelItemInfo : public LLPanel, public LLInventoryObserver
 {
@@ -105,6 +106,7 @@ private:
     LLIconCtrl* mItemTypeIcon;
     LLTextBox* mLabelOwnerName;
     LLTextBox* mLabelCreatorName;
+    LLTextEditor* mLabelItemDesc;
 
     //
     // UI Elements
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index cee43f3cff..afa4686d52 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -116,8 +116,8 @@ void LLSkinningUtil::scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin
         // needed for handling of any legacy bad data.
         if (!avatar->getJoint(skin->mJointNames[j]))
         {
-            LL_DEBUGS("Avatar") << avatar->getFullname() << " mesh rigged to invalid joint " << skin->mJointNames[j] << LL_ENDL;
-            LL_WARNS_ONCE("Avatar") << avatar->getFullname() << " mesh rigged to invalid joint" << skin->mJointNames[j] << LL_ENDL;
+            LL_DEBUGS("Avatar") << avatar->getDebugName() << " mesh rigged to invalid joint " << skin->mJointNames[j] << LL_ENDL;
+            LL_WARNS_ONCE("Avatar") << avatar->getDebugName() << " mesh rigged to invalid joint" << skin->mJointNames[j] << LL_ENDL;
             skin->mJointNames[j] = "mPelvis";
             skin->mJointNumsInitialized = false; // force update after names change.
         }
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index ea95d71b27..7d5f380886 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -1066,7 +1066,7 @@ void LLSnapshotLivePreview::saveTexture(bool outfit_snapshot, std::string name)
             tid, LLAssetType::AT_TEXTURE, res_name, res_desc, 0,
             folder_type, inv_type,
             PERM_ALL, LLFloaterPerms::getGroupPerms("Uploads"), LLFloaterPerms::getEveryonePerms("Uploads"),
-            expected_upload_cost, !outfit_snapshot));
+            expected_upload_cost, LLUUID::null, !outfit_snapshot));
 
         upload_new_resource(assetUploadInfo);
 
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp
index dd7c6aa9e3..e02f76711c 100644
--- a/indra/newview/llteleporthistorystorage.cpp
+++ b/indra/newview/llteleporthistorystorage.cpp
@@ -127,6 +127,12 @@ void LLTeleportHistoryStorage::addItem(const std::string title, const LLVector3d
     S32 removed_index = -1;
     if (item_iter != mItems.end())
     {
+        // When teleporting via history it's possible that there can be
+        // an offset applied to the position, so each new teleport can
+        // be a meter higher than the last.
+        // Avoid it by preserving original position.
+        item.mGlobalPos = item_iter->mGlobalPos;
+
         removed_index = (S32)(item_iter - mItems.begin());
         mItems.erase(item_iter);
     }
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 35057a910a..ff01e537ee 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -185,6 +185,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
     mSetImageAssetIDCallback(NULL),
     mOnUpdateImageStatsCallback(NULL),
     mBakeTextureEnabled(false),
+    mLocalTextureEnabled(false),
     mInventoryPickType(pick_type)
 {
     mCanApplyImmediately = can_apply_immediately;
@@ -524,6 +525,8 @@ bool LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask)
 void LLFloaterTexturePicker::onOpen(const LLSD& key)
 {
     if (sLastPickerMode != 0
+        && (mLocalTextureEnabled || sLastPickerMode != 1)
+        && (mBakeTextureEnabled || sLastPickerMode != 2)
         && mModeSelector->selectByValue(sLastPickerMode))
     {
         changeMode();
@@ -1490,7 +1493,13 @@ void LLFloaterTexturePicker::refreshInventoryFilter()
 
 void LLFloaterTexturePicker::setLocalTextureEnabled(bool enabled)
 {
+    mLocalTextureEnabled = enabled;
     mModeSelector->setEnabledByValue(1, enabled);
+    if (!enabled && (mModeSelector->getValue().asInteger() == 2))
+    {
+        mModeSelector->selectByValue(0);
+        onModeSelect(0, this);
+    }
 }
 
 void LLFloaterTexturePicker::setBakeTextureEnabled(bool enabled)
@@ -1877,11 +1886,9 @@ void LLTextureCtrl::showPicker(bool take_focus)
         if (texture_floaterp)
         {
             texture_floaterp->setOnFloaterCommitCallback(boost::bind(&LLTextureCtrl::onFloaterCommit, this, _1, _2, _3, _4, _5));
-        }
-        if (texture_floaterp)
-        {
             texture_floaterp->setSetImageAssetIDCallback(boost::bind(&LLTextureCtrl::setImageAssetID, this, _1));
 
+            texture_floaterp->setLocalTextureEnabled(mAllowLocalTexture);
             texture_floaterp->setBakeTextureEnabled(mBakeTextureEnabled && mInventoryPickType != PICK_MATERIAL);
         }
 
@@ -1891,12 +1898,6 @@ void LLTextureCtrl::showPicker(bool take_focus)
         floaterp->openFloater();
     }
 
-    LLFloaterTexturePicker* picker_floater = dynamic_cast<LLFloaterTexturePicker*>(floaterp);
-    if (picker_floater)
-    {
-        picker_floater->setLocalTextureEnabled(mAllowLocalTexture);
-    }
-
     if (take_focus)
     {
         floaterp->setFocus(true);
@@ -2076,7 +2077,17 @@ void LLTextureCtrl::setOnTextureSelectedCallback(texture_selected_callback cb)
     }
 }
 
-void    LLTextureCtrl::setImageAssetName(const std::string& name)
+void LLTextureCtrl::setAllowLocalTexture(bool b)
+{
+    mAllowLocalTexture = b;
+    LLFloaterTexturePicker* picker_floater = dynamic_cast<LLFloaterTexturePicker*>(mFloaterHandle.get());
+    if (picker_floater)
+    {
+        picker_floater->setLocalTextureEnabled(mAllowLocalTexture);
+    }
+}
+
+void LLTextureCtrl::setImageAssetName(const std::string& name)
 {
     LLPointer<LLUIImage> imagep = LLUI::getUIImage(name);
     if(imagep)
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index df5e763139..581242cc53 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -181,7 +181,7 @@ public:
     void            setAllowNoTexture( bool b )                 { mAllowNoTexture = b; }
     bool            getAllowNoTexture() const                   { return mAllowNoTexture; }
 
-    void            setAllowLocalTexture(bool b)                    { mAllowLocalTexture = b; }
+    void            setAllowLocalTexture(bool b);
     bool            getAllowLocalTexture() const                    { return mAllowLocalTexture; }
 
     const LLUUID&   getImageItemID() { return mImageItemID; }
@@ -456,6 +456,7 @@ private:
     set_on_update_image_stats_callback mOnUpdateImageStatsCallback;
 
     bool mBakeTextureEnabled;
+    bool mLocalTextureEnabled;
 
     static S32 sLastPickerMode;
 };
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 087761cbd0..cc187a1f98 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2484,7 +2484,7 @@ LLTextureFetch::~LLTextureFetch()
 }
 
 S32 LLTextureFetch::createRequest(FTType f_type, const std::string& url, const LLUUID& id, const LLHost& host, F32 priority,
-                                   S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux, bool can_use_http)
+    S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux, bool can_use_http)
 {
     LL_PROFILE_ZONE_SCOPED;
     if (mDebugPause)
@@ -2496,13 +2496,13 @@ S32 LLTextureFetch::createRequest(FTType f_type, const std::string& url, const L
     {
         LL_DEBUGS("Avatar") << " requesting " << id << " " << w << "x" << h << " discard " << desired_discard << " type " << f_type << LL_ENDL;
     }
-    LLTextureFetchWorker* worker = getWorker(id) ;
+    LLTextureFetchWorker* worker = getWorker(id);
     if (worker)
     {
         if (worker->mHost != host)
         {
             LL_WARNS(LOG_TXT) << "LLTextureFetch::createRequest " << id << " called with multiple hosts: "
-                              << host << " != " << worker->mHost << LL_ENDL;
+                << host << " != " << worker->mHost << LL_ENDL;
             removeRequest(worker, true);
             worker = NULL;
             return CREATE_REQUEST_ERROR_MHOSTS;
@@ -2538,7 +2538,7 @@ S32 LLTextureFetch::createRequest(FTType f_type, const std::string& url, const L
         // we really do get it.)
         desired_size = MAX_IMAGE_DATA_SIZE;
     }
-    else if (w*h*c > 0)
+    else if (w * h * c > 0)
     {
         // If the requester knows the dimensions of the image,
         // this will calculate how much data we need without having to parse the header
@@ -2596,14 +2596,15 @@ S32 LLTextureFetch::createRequest(FTType f_type, const std::string& url, const L
         worker->lockWorkMutex();                                        // +Mw
         worker->mActiveCount++;
         worker->mNeedsAux = needs_aux;
-        worker->setCanUseHTTP(can_use_http) ;
+        worker->setCanUseHTTP(can_use_http);
         worker->unlockWorkMutex();                                      // -Mw
     }
 
     LL_DEBUGS(LOG_TXT) << "REQUESTED: " << id << " f_type " << fttype_to_string(f_type)
-                       << " Discard: " << desired_discard << " size " << desired_size << LL_ENDL;
+        << " Discard: " << desired_discard << " size " << desired_size << LL_ENDL;
     return desired_discard;
 }
+
 // Threads:  T*
 //
 // protected
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 8ab90896dc..851d6c11a0 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -85,8 +85,9 @@ public:
     };
 
     // Threads:  T* (but Tmain mostly)
+    // returns discard on success, fail code otherwise
     S32 createRequest(FTType f_type, const std::string& url, const LLUUID& id, const LLHost& host, F32 priority,
-                       S32 w, S32 h, S32 c, S32 discard, bool needs_aux, bool can_use_http);
+                      S32 w, S32 h, S32 c, S32 discard, bool needs_aux, bool can_use_http);
 
     // Requests that a fetch operation be deleted from the queue.
     // If @cancel is true, also stops any I/O operations pending.
diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
index ae21d3e733..b077262f06 100644
--- a/indra/newview/llthumbnailctrl.cpp
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -111,7 +111,9 @@ void LLThumbnailCtrl::draw()
 
         gl_draw_scaled_image( draw_rect.mLeft, draw_rect.mBottom, draw_rect.getWidth(), draw_rect.getHeight(), mTexturep, UI_VERTEX_COLOR % alpha);
 
-        mTexturep->setKnownDrawSize(draw_rect.getWidth(), draw_rect.getHeight());
+        // Thumbnails are usually 256x256 or smaller, either report that or
+        // some high value to get image with higher priority
+        mTexturep->setKnownDrawSize(MAX_IMAGE_SIZE, MAX_IMAGE_SIZE);
     }
     else if( mImagep.notNull() )
     {
@@ -238,12 +240,8 @@ void LLThumbnailCtrl::initImage()
         {
             // Should it support baked textures?
             mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, MIPMAP_YES, LLGLTexture::BOOST_THUMBNAIL);
-
             mTexturep->forceToSaveRawImage(0);
-
-            S32 desired_draw_width = MAX_IMAGE_SIZE;
-            S32 desired_draw_height = MAX_IMAGE_SIZE;
-            mTexturep->setKnownDrawSize(desired_draw_width, desired_draw_height);
+            mTexturep->setKnownDrawSize(MAX_IMAGE_SIZE, MAX_IMAGE_SIZE);
         }
     }
     else if (tvalue.isString())
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 84854a79d4..0f871dc1bb 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -421,7 +421,7 @@ void LLToast::setVisible(bool show)
         if(mHideBtn)
             mHideBtn->setVisible(show);
     }
-    LLFloater::setVisible(show);
+    LLModalDialog::setVisible(show);
     if (mPanel
         && !mPanel->isDead()
         && mWrapperPanel
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 9d6f44c096..83b0260425 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -2156,7 +2156,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
     {
         if(mSource == SOURCE_LIBRARY)
         {
-            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, (LLViewerJointAttachment*)0));
+            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, (LLViewerJointAttachment*)0, false));
             copy_inventory_item(
                 gAgent.getID(),
                 item->getPermissions().getOwner(),
@@ -2167,7 +2167,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
         }
         else
         {
-            rez_attachment(item, 0);
+            rez_attachment(item, 0, false);
         }
     }
     return ACCEPT_YES_SINGLE;
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index 7ef2c8d697..7d5386110d 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -62,7 +62,8 @@ LLResourceUploadInfo::LLResourceUploadInfo(LLTransactionID transactId,
         LLAssetType::EType assetType, std::string name, std::string description,
         S32 compressionInfo, LLFolderType::EType destinationType,
         LLInventoryType::EType inventoryType, U32 nextOWnerPerms,
-        U32 groupPerms, U32 everyonePerms, S32 expectedCost, bool showInventory) :
+        U32 groupPerms, U32 everyonePerms, S32 expectedCost,
+        const LLUUID& destFolderId, bool showInventory) :
     mTransactionId(transactId),
     mAssetType(assetType),
     mName(name),
@@ -75,7 +76,7 @@ LLResourceUploadInfo::LLResourceUploadInfo(LLTransactionID transactId,
     mEveryonePerms(everyonePerms),
     mExpectedUploadCost(expectedCost),
     mShowInventory(showInventory),
-    mFolderId(LLUUID::null),
+    mFolderId(destFolderId),
     mItemId(LLUUID::null),
     mAssetId(LLAssetID::null)
 { }
@@ -84,7 +85,8 @@ LLResourceUploadInfo::LLResourceUploadInfo(LLTransactionID transactId,
 LLResourceUploadInfo::LLResourceUploadInfo(std::string name,
         std::string description, S32 compressionInfo,
         LLFolderType::EType destinationType, LLInventoryType::EType inventoryType,
-        U32 nextOWnerPerms, U32 groupPerms, U32 everyonePerms, S32 expectedCost, bool showInventory) :
+        U32 nextOWnerPerms, U32 groupPerms, U32 everyonePerms, S32 expectedCost,
+        const LLUUID& destFolderId, bool showInventory) :
     mName(name),
     mDescription(description),
     mCompressionInfo(compressionInfo),
@@ -97,7 +99,7 @@ LLResourceUploadInfo::LLResourceUploadInfo(std::string name,
     mShowInventory(showInventory),
     mTransactionId(),
     mAssetType(LLAssetType::AT_NONE),
-    mFolderId(LLUUID::null),
+    mFolderId(destFolderId),
     mItemId(LLUUID::null),
     mAssetId(LLAssetID::null)
 {
@@ -306,10 +308,10 @@ void LLResourceUploadInfo::assignDefaults()
     }
     else
     {
-    mFolderId = gInventory.findUserDefinedCategoryUUIDForType(
-        (mDestinationFolderType == LLFolderType::FT_NONE) ?
-        (LLFolderType::EType)mAssetType : mDestinationFolderType);
-}
+        mFolderId = gInventory.findUserDefinedCategoryUUIDForType(
+            (mDestinationFolderType == LLFolderType::FT_NONE) ?
+            (LLFolderType::EType)mAssetType : mDestinationFolderType);
+    }
 }
 
 std::string LLResourceUploadInfo::getDisplayName() const
@@ -366,10 +368,12 @@ LLNewFileResourceUploadInfo::LLNewFileResourceUploadInfo(
     U32 groupPerms,
     U32 everyonePerms,
     S32 expectedCost,
+    const LLUUID& destFolderId,
     bool show_inventory) :
     LLResourceUploadInfo(name, description, compressionInfo,
     destinationType, inventoryType,
-    nextOWnerPerms, groupPerms, everyonePerms, expectedCost, show_inventory),
+    nextOWnerPerms, groupPerms, everyonePerms, expectedCost,
+    destFolderId, show_inventory),
     mFileName(fileName),
     mMaxImageSize(LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT)
 {
@@ -580,12 +584,13 @@ LLNewBufferedResourceUploadInfo::LLNewBufferedResourceUploadInfo(
     U32 groupPerms,
     U32 everyonePerms,
     S32 expectedCost,
+    const LLUUID& destFolderId,
     bool show_inventory,
     uploadFinish_f finish,
     uploadFailure_f failure)
     : LLResourceUploadInfo(name, description, compressionInfo,
         destinationType, inventoryType,
-        nextOWnerPerms, groupPerms, everyonePerms, expectedCost, show_inventory)
+        nextOWnerPerms, groupPerms, everyonePerms, expectedCost, destFolderId, show_inventory)
     , mBuffer(buffer)
     , mFinishFn(finish)
     , mFailureFn(failure)
diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h
index 365436ede0..c627e9dbb8 100644
--- a/indra/newview/llviewerassetupload.h
+++ b/indra/newview/llviewerassetupload.h
@@ -54,6 +54,7 @@ public:
         U32 groupPerms,
         U32 everyonePerms,
         S32 expectedCost,
+        const LLUUID &destFolderId = LLUUID::null,
         bool showInventory = true);
 
     virtual ~LLResourceUploadInfo()
@@ -104,6 +105,7 @@ protected:
         U32 groupPerms,
         U32 everyonePerms,
         S32 expectedCost,
+        const LLUUID& destFolderId = LLUUID::null,
         bool showInventory = true);
 
     LLResourceUploadInfo(
@@ -155,6 +157,7 @@ public:
         U32 groupPerms,
         U32 everyonePerms,
         S32 expectedCost,
+        const LLUUID &destFolderId = LLUUID::null,
         bool show_inventory = true);
 
     virtual LLSD        prepareUpload();
@@ -193,6 +196,7 @@ public:
         U32 groupPerms,
         U32 everyonePerms,
         S32 expectedCost,
+        const LLUUID& destFolderId, // use null for default
         bool show_inventory,
         uploadFinish_f finish,
         uploadFailure_f failure);
@@ -219,6 +223,7 @@ public:
     typedef std::function<void(LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response)> taskUploadFinish_f;
     typedef std::function<bool(LLUUID itemId, LLUUID taskId, LLSD response, std::string reason)> uploadFailed_f;
 
+    // destFolderId is the folder to put the new item in, leave null for default
     LLBufferedAssetUploadInfo(LLUUID itemId, LLAssetType::EType assetType, std::string buffer, invnUploadFinish_f finish, uploadFailed_f failed);
     LLBufferedAssetUploadInfo(LLUUID itemId, LLPointer<LLImageFormatted> image, invnUploadFinish_f finish);
     LLBufferedAssetUploadInfo(LLUUID taskId, LLUUID itemId, LLAssetType::EType assetType, std::string buffer, taskUploadFinish_f finish, uploadFailed_f failed);
diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp
index f2557e299c..9828ab1fdf 100644
--- a/indra/newview/llviewerattachmenu.cpp
+++ b/indra/newview/llviewerattachmenu.cpp
@@ -116,12 +116,12 @@ void LLViewerAttachMenu::attachObjects(const uuid_vec_t& items, const std::strin
         LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getLinkedItem(id);
         if(item && gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID()))
         {
-            rez_attachment(item, attachmentp); // don't replace if called from an "Attach To..." menu
+            rez_attachment(item, attachmentp, false); // don't replace if called from an "Attach To..." menu
         }
         else if(item && item->isFinished())
         {
             // must be in library. copy it to our inventory and put it on.
-            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, attachmentp));
+            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, attachmentp, false));
             copy_inventory_item(gAgent.getID(),
                                 item->getPermissions().getOwner(),
                                 item->getUUID(),
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index 6cf99b68b2..a0d307a3f4 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -81,18 +81,16 @@ LLViewerCamera::~LLViewerCamera()
     mCameraAngleChangedSignal.disconnect();
 }
 
-void LLViewerCamera::updateCameraLocation(const LLVector3 &center, const LLVector3 &up_direction, const LLVector3 &point_of_interest)
+bool LLViewerCamera::updateCameraLocation(const LLVector3 &center, const LLVector3 &up_direction, const LLVector3 &point_of_interest)
 {
     // do not update if avatar didn't move
     if (!LLViewerJoystick::getInstance()->getCameraNeedsUpdate())
     {
-        return;
+        return true;
     }
 
-    LLVector3 last_position;
-    LLVector3 last_axis;
-    last_position = getOrigin();
-    last_axis     = getAtAxis();
+    LLVector3 last_position = getOrigin();
+    LLVector3 last_axis = getAtAxis();
 
     mLastPointOfInterest = point_of_interest;
 
@@ -102,30 +100,49 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center, const LLVecto
         regp = gAgent.getRegion();
     }
 
-    F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f;
+    F32 water_height = regp ? regp->getWaterHeight() : 0.f;
 
     LLVector3 origin = center;
 
+    // Move origin[VZ] far enough (up or down) from the water surface
+    static const F32 MIN_DIST_TO_WATER = 0.2f;
+    F32& zpos = origin.mV[VZ];
+    if (zpos < water_height + MIN_DIST_TO_WATER)
     {
-        if (origin.mV[2] > water_height)
+        if (zpos >= water_height)
         {
-            origin.mV[2] = llmax(origin.mV[2], water_height + 0.20f);
+            zpos = water_height + MIN_DIST_TO_WATER;
         }
-        else
+        else if (zpos > water_height - MIN_DIST_TO_WATER)
         {
-            origin.mV[2] = llmin(origin.mV[2], water_height - 0.20f);
+            zpos = water_height - MIN_DIST_TO_WATER;
         }
     }
 
-    setOriginAndLookAt(origin, up_direction, point_of_interest);
+    LLVector3 at(point_of_interest - origin);
+    at.normalize();
+    if (at.isNull() || !at.isFinite())
+        return false;
+
+    LLVector3 left(up_direction % at);
+    left.normalize();
+    if (left.isNull() || !left.isFinite())
+        return false;
+
+    LLVector3 up = at % left;
+    up.normalize();
+    if (up.isNull() || !up.isFinite())
+        return false;
+
+    setOrigin(origin);
+    setAxes(at, left, up);
 
     mVelocityDir = origin - last_position ;
     F32 dpos = mVelocityDir.normVec() ;
     LLQuaternion rotation;
     rotation.shortestArc(last_axis, getAtAxis());
 
-    F32 x, y, z;
-    F32 drot;
+    F32 drot, x, y, z;
     rotation.getAngleAxis(&drot, &x, &y, &z);
 
     add(sVelocityStat, dpos);
@@ -138,6 +155,8 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center, const LLVecto
     // update pixel meter ratio using default fov, not modified one
     mPixelMeterRatio = (F32)(getViewHeightInPixels()/ (2.f*tanf(mCameraFOVDefault*0.5f)));
     // update screen pixel area
+
+    return true;
     mScreenPixelArea =(S32)((F32)getViewHeightInPixels() * ((F32)getViewHeightInPixels() * getAspect()));
 }
 
@@ -145,7 +164,6 @@ const LLMatrix4 &LLViewerCamera::getProjection() const
 {
     calcProjection(getFar());
     return mProjectionMatrix;
-
 }
 
 const LLMatrix4 &LLViewerCamera::getModelview() const
@@ -158,13 +176,12 @@ const LLMatrix4 &LLViewerCamera::getModelview() const
 
 void LLViewerCamera::calcProjection(const F32 far_distance) const
 {
-    F32 fov_y, z_far, z_near, aspect, f;
-    fov_y = getView();
-    z_far = far_distance;
-    z_near = getNear();
-    aspect = getAspect();
+    F32 fov_y = getView();
+    F32 z_far = far_distance;
+    F32 z_near = getNear();
+    F32 aspect = getAspect();
 
-    f = 1/tan(fov_y*0.5f);
+    F32 f = 1 / tan(fov_y * 0.5f);
 
     mProjectionMatrix.setZero();
     mProjectionMatrix.mMatrix[0][0] = f/aspect;
@@ -270,9 +287,9 @@ void LLViewerCamera::updateFrustumPlanes(LLCamera& camera, bool ortho, bool zfli
 }
 
 void LLViewerCamera::setPerspective(bool for_selection,
-                                    S32 x, S32 y_from_bot, S32 width, S32 height,
-                                    bool limit_select_distance,
-                                    F32 z_near, F32 z_far)
+    S32 x, S32 y_from_bot, S32 width, S32 height,
+    bool limit_select_distance,
+    F32 z_near, F32 z_far)
 {
     F32 fov_y, aspect;
     fov_y = getView();
@@ -334,7 +351,7 @@ void LLViewerCamera::setPerspective(bool for_selection,
     {
         float offset = mZoomFactor - 1.f;
         int pos_y = mZoomSubregion / llceil(mZoomFactor);
-        int pos_x = mZoomSubregion - (pos_y*llceil(mZoomFactor));
+        int pos_x = mZoomSubregion - (pos_y * llceil(mZoomFactor));
 
         glm::mat4 translate;
         translate = glm::translate(glm::vec3(offset - (F32)pos_x * 2.f, offset - (F32)pos_y * 2.f, 0.f));
@@ -347,7 +364,7 @@ void LLViewerCamera::setPerspective(bool for_selection,
 
     calcProjection(z_far); // Update the projection matrix cache
 
-    proj_mat *= glm::perspective(fov_y,aspect,z_near,z_far);
+    proj_mat *= glm::perspective(fov_y, aspect, z_near, z_far);
 
     gGL.loadMatrix(glm::value_ptr(proj_mat));
 
@@ -355,7 +372,7 @@ void LLViewerCamera::setPerspective(bool for_selection,
 
     gGL.matrixMode(LLRender::MM_MODELVIEW);
 
-    glm::mat4 modelview(glm::make_mat4((GLfloat*) OGL_TO_CFR_ROTATION));
+    glm::mat4 modelview(glm::make_mat4((GLfloat*)OGL_TO_CFR_ROTATION));
 
     GLfloat         ogl_matrix[16];
 
@@ -371,9 +388,9 @@ void LLViewerCamera::setPerspective(bool for_selection,
         // however, it is also unused (the GL matricies are used for selection, (see LLCamera::sphereInFrustum())) and so i'm not
         // comfortable hacking on it.
         calculateFrustumPlanesFromWindow((F32)(x - width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f,
-                                (F32)(y_from_bot - height / 2) / (F32)gViewerWindow->getWindowHeightScaled() - 0.5f,
-                                (F32)(x + width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f,
-                                (F32)(y_from_bot + height / 2) / (F32)gViewerWindow->getWindowHeightScaled() - 0.5f);
+            (F32)(y_from_bot - height / 2) / (F32)gViewerWindow->getWindowHeightScaled() - 0.5f,
+            (F32)(x + width / 2) / (F32)gViewerWindow->getWindowWidthScaled() - 0.5f,
+            (F32)(y_from_bot + height / 2) / (F32)gViewerWindow->getWindowHeightScaled() - 0.5f);
 
     }
 
@@ -387,7 +404,6 @@ void LLViewerCamera::setPerspective(bool for_selection,
     updateFrustumPlanes(*this);
 }
 
-
 // Uses the last GL matrices set in set_perspective to project a point from
 // screen coordinates to the agent's region.
 void LLViewerCamera::projectScreenToPosAgent(const S32 screen_x, const S32 screen_y, LLVector3* pos_agent) const
diff --git a/indra/newview/llviewercamera.h b/indra/newview/llviewercamera.h
index a204b85d88..61aebf73f6 100644
--- a/indra/newview/llviewercamera.h
+++ b/indra/newview/llviewercamera.h
@@ -61,7 +61,7 @@ public:
 
     static eCameraID sCurCameraID;
 
-    void updateCameraLocation(const LLVector3 &center,
+    bool updateCameraLocation(const LLVector3 &center,
                                 const LLVector3 &up_direction,
                                 const LLVector3 &point_of_interest);
 
@@ -77,12 +77,12 @@ public:
     bool projectPosAgentToScreen(const LLVector3 &pos_agent, LLCoordGL &out_point, const bool clamp = true) const;
     bool projectPosAgentToScreenEdge(const LLVector3 &pos_agent, LLCoordGL &out_point) const;
 
+    F32     getCosHalfFov() const { return mCosHalfCameraFOV; }
+    F32     getAverageSpeed() const { return mAverageSpeed; }
+    F32     getAverageAngularSpeed() const { return mAverageAngularSpeed; }
     LLVector3 getVelocityDir() const {return mVelocityDir;}
     static LLTrace::CountStatHandle<>* getVelocityStat()           {return &sVelocityStat; }
     static LLTrace::CountStatHandle<>* getAngularVelocityStat()  {return &sAngularVelocityStat; }
-    F32     getCosHalfFov() {return mCosHalfCameraFOV;}
-    F32     getAverageSpeed() {return mAverageSpeed ;}
-    F32     getAverageAngularSpeed() {return mAverageAngularSpeed;}
 
     void getPixelVectors(const LLVector3 &pos_agent, LLVector3 &up, LLVector3 &right);
     LLVector3 roundToPixel(const LLVector3 &pos_agent);
@@ -90,21 +90,21 @@ public:
     // Sets the current matrix
     /* virtual */ void setView(F32 vertical_fov_rads); // NOTE: broadcasts to simulator
     void setViewNoBroadcast(F32 vertical_fov_rads);  // set FOV without broadcasting to simulator (for temporary local cameras)
+    F32 getDefaultFOV() const { return mCameraFOVDefault; }
     void setDefaultFOV(F32 fov) ;
-    F32 getDefaultFOV() { return mCameraFOVDefault; }
 
     bool isDefaultFOVChanged();
 
     bool cameraUnderWater() const;
     bool areVertsVisible(LLViewerObject* volumep, bool all_verts);
 
-    const LLVector3 &getPointOfInterest() { return mLastPointOfInterest; }
+    const LLVector3& getPointOfInterest() const { return mLastPointOfInterest; }
     F32 getPixelMeterRatio() const              { return mPixelMeterRatio; }
     S32 getScreenPixelArea() const              { return mScreenPixelArea; }
 
     void setZoomParameters(F32 factor, S16 subregion) { mZoomFactor = factor; mZoomSubregion = subregion; }
-    F32 getZoomFactor() { return mZoomFactor; }
-    S16 getZoomSubRegion() { return mZoomSubregion; }
+    F32 getZoomFactor() const { return mZoomFactor; }
+    S16 getZoomSubRegion() const { return mZoomSubregion; }
 
 protected:
     void calcProjection(const F32 far_distance) const;
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index e2022cae37..36ec6f0d78 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -966,7 +966,7 @@ void LLInventoryCallbackManager::fire(U32 callback_id, const LLUUID& item_id)
     }
 }
 
-void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachmentp)
+void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachmentp, bool replace)
 {
     if (inv_item.isNull())
         return;
@@ -974,7 +974,7 @@ void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachme
     LLViewerInventoryItem *item = gInventory.getItem(inv_item);
     if (item)
     {
-        rez_attachment(item, attachmentp);
+        rez_attachment(item, attachmentp, replace);
     }
 }
 
@@ -1436,7 +1436,8 @@ void update_inventory_category(
     if(obj)
     {
         if (LLFolderType::lookupIsProtectedType(obj->getPreferredType())
-            && (updates.size() != 1 || !updates.has("thumbnail")))
+            && (updates.size() != 1
+                || !(updates.has("thumbnail") || updates.has("favorite"))))
         {
             LLNotificationsUtil::add("CannotModifyProtectedCategories");
             return;
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 21a6606253..18daa368d9 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -264,7 +264,7 @@ public:
 
 class LLViewerJointAttachment;
 
-void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachmentp);
+void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachmentp, bool replace);
 
 void activate_gesture_cb(const LLUUID& inv_item);
 
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index 7543fb3743..9d45ea24b9 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -881,6 +881,10 @@ void LLViewerJoystick::moveObjects(bool reset)
         {
             gAgent.clearAFK();
         }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
 
         if (sDelta[0] || sDelta[1] || sDelta[2])
         {
@@ -1055,6 +1059,10 @@ void LLViewerJoystick::moveAvatar(bool reset)
         {
             gAgent.clearAFK();
         }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
 
         setCameraNeedsUpdate(true);
     }
@@ -1267,10 +1275,17 @@ void LLViewerJoystick::moveFlycam(bool reset)
     }
 
     // Clear AFK state if moved beyond the deadzone
-    if (!is_zero && gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
+    if (!is_zero)
+    {
+        if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
     {
         gAgent.clearAFK();
     }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
+    }
 
     sFlycamPosition += LLVector3(sDelta) * sFlycamRotation;
 
@@ -1331,6 +1346,10 @@ bool LLViewerJoystick::toggleFlycam()
     {
         gAgent.clearAFK();
     }
+    else
+    {
+        gAwayTriggerTimer.reset();
+    }
 
     mOverrideCamera = !mOverrideCamera;
     if (mOverrideCamera)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 1f8f960300..7c073a4f39 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -90,6 +90,7 @@
 #include "lltoolface.h"
 #include "llhints.h"
 #include "llhudeffecttrail.h"
+#include "llhudeffectresetskeleton.h"
 #include "llhudmanager.h"
 #include "llimview.h"
 #include "llinventorybridge.h"
@@ -1851,7 +1852,6 @@ class LLAdvancedAppearanceToXML : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
     {
-        std::string emptyname;
         LLViewerObject *obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
         LLVOAvatar *avatar = NULL;
         if (obj)
@@ -1878,7 +1878,7 @@ class LLAdvancedAppearanceToXML : public view_listener_t
         }
         if (avatar)
         {
-            avatar->dumpArchetypeXML(emptyname);
+            avatar->dumpArchetypeXML(LLStringUtil::null);
         }
         return true;
     }
@@ -5646,6 +5646,38 @@ class LLToolsEnablePathfindingRebakeRegion : public view_listener_t
     }
 };
 
+class LLToolsCheckSelectionLODMode : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        std::string param = userdata.asString();
+        static LLCachedControl<S32> debug_selection_lods(gSavedSettings, "DebugSelectionLODs", 0);
+        if ("default" == param)
+        {
+            return debug_selection_lods() < 0;
+        }
+        else if ("high" == param)
+        {
+            return debug_selection_lods() == 3;
+        }
+        else if ("medium" == param)
+        {
+            return debug_selection_lods() == 2;
+        }
+        else if ("low" == param)
+        {
+            return debug_selection_lods() == 1;
+        }
+        else if ("lowest" == param)
+        {
+            return debug_selection_lods() == 0;
+        }
+
+        return false;
+    }
+};
+
+
 // Round the position of all root objects to the grid
 class LLToolsSnapObjectXY : public view_listener_t
 {
@@ -6670,8 +6702,18 @@ class LLAvatarResetSkeleton : public view_listener_t
     {
         if (LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()))
         {
+            if(avatar->getID() == gAgentID)
+            {
+                LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);
+                effectp->setSourceObject(gAgentAvatarp);
+                effectp->setTargetObject((LLViewerObject*)avatar);
+                effectp->setResetAnimations(false);
+            }
+            else
+            {
             avatar->resetSkeleton(false);
         }
+        }
         return true;
     }
 };
@@ -6694,8 +6736,18 @@ class LLAvatarResetSkeletonAndAnimations : public view_listener_t
     {
         if (LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()))
         {
+            if(avatar->getID() == gAgentID)
+            {
+                LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);
+                effectp->setSourceObject(gAgentAvatarp);
+                effectp->setTargetObject((LLViewerObject*)avatar);
+                effectp->setResetAnimations(true);
+            }
+            else
+            {
             avatar->resetSkeleton(true);
         }
+        }
         return true;
     }
 };
@@ -6722,11 +6774,24 @@ class LLAvatarResetSelfSkeletonAndAnimations : public view_listener_t
     {
         if (LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()))
         {
-            avatar->resetSkeleton(true);
+            if(avatar->getID() == gAgentID)
+            {
+                LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);
+                effectp->setSourceObject(gAgentAvatarp);
+                effectp->setTargetObject((LLViewerObject*)avatar);
+                effectp->setResetAnimations(true);
+        }
+        else
+        {
+                avatar->resetSkeleton(true);
+            }
         }
         else
         {
-            gAgentAvatarp->resetSkeleton(true);
+            LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);
+            effectp->setSourceObject(gAgentAvatarp);
+            effectp->setTargetObject(gAgentAvatarp);
+            effectp->setResetAnimations(true);
         }
         return true;
     }
@@ -8572,6 +8637,36 @@ class LLToolsSelectBySurrounding : public view_listener_t
     }
 };
 
+class LLToolsSelectionLODMode : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        std::string param = userdata.asString();
+        if ("default" == param)
+        {
+            gSavedSettings.setS32("DebugSelectionLODs", -1);
+        }
+        else if ("high" == param)
+        {
+            gSavedSettings.setS32("DebugSelectionLODs", 3);
+        }
+        else if ("medium" == param)
+        {
+            gSavedSettings.setS32("DebugSelectionLODs", 2);
+        }
+        else if ("low" == param)
+        {
+            gSavedSettings.setS32("DebugSelectionLODs", 1);
+        }
+        else if ("lowest" == param)
+        {
+            gSavedSettings.setS32("DebugSelectionLODs", 0);
+        }
+
+        return true;
+    }
+};
+
 class LLToolsShowHiddenSelection : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
@@ -9806,6 +9901,7 @@ void initialize_menus()
     view_listener_t::addMenu(new LLToolsSelectInvisibleObjects(), "Tools.SelectInvisibleObjects");
     view_listener_t::addMenu(new LLToolsSelectReflectionProbes(), "Tools.SelectReflectionProbes");
     view_listener_t::addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
+    view_listener_t::addMenu(new LLToolsSelectionLODMode(), "Tools.SelectionLODMode");
     view_listener_t::addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
     view_listener_t::addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
     view_listener_t::addMenu(new LLToolsEditLinkedParts(), "Tools.EditLinkedParts");
@@ -9838,6 +9934,7 @@ void initialize_menus()
     view_listener_t::addMenu(new LLToolsEnablePathfindingView(), "Tools.EnablePathfindingView");
     view_listener_t::addMenu(new LLToolsDoPathfindingRebakeRegion(), "Tools.DoPathfindingRebakeRegion");
     view_listener_t::addMenu(new LLToolsEnablePathfindingRebakeRegion(), "Tools.EnablePathfindingRebakeRegion");
+    view_listener_t::addMenu(new LLToolsCheckSelectionLODMode(), "Tools.ToolsCheckSelectionLODMode");
 
     // Help menu
     // most items use the ShowFloater method
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index ce66dbc03f..fecc0edba4 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -478,13 +478,19 @@ const bool check_file_extension(const std::string& filename, LLFilePicker::ELoad
     return true;
 }
 
-const void upload_single_file(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter type)
+void upload_single_file(
+    const std::vector<std::string>& filenames,
+    LLFilePicker::ELoadFilter type,
+    const LLUUID& dest)
 {
     std::string filename = filenames[0];
     if (!check_file_extension(filename, type)) return;
 
     if (!filename.empty())
     {
+        LLSD args;
+        args["filename"] = filename;
+        args["dest"] = dest;
         if (type == LLFilePicker::FFLOAD_WAV)
         {
             // pre-qualify wavs to make sure the format is acceptable
@@ -499,12 +505,12 @@ const void upload_single_file(const std::vector<std::string>& filenames, LLFileP
             }
             else
             {
-                LLFloaterReg::showInstance("upload_sound", LLSD(filename));
+                LLFloaterReg::showInstance("upload_sound", args);
             }
         }
         if (type == LLFilePicker::FFLOAD_IMAGE)
         {
-            LLFloaterReg::showInstance("upload_image", LLSD(filename));
+            LLFloaterReg::showInstance("upload_image", args);
         }
         if (type == LLFilePicker::FFLOAD_ANIM)
         {
@@ -512,11 +518,11 @@ const void upload_single_file(const std::vector<std::string>& filenames, LLFileP
             LLStringUtil::toLower(filename_lc);
             if (filename_lc.rfind(".anim") != std::string::npos)
             {
-                LLFloaterReg::showInstance("upload_anim_anim", LLSD(filename));
+                LLFloaterReg::showInstance("upload_anim_anim", args);
             }
             else
             {
-                LLFloaterReg::showInstance("upload_anim_bvh", LLSD(filename));
+                LLFloaterReg::showInstance("upload_anim_bvh", args);
             }
         }
     }
@@ -709,7 +715,7 @@ bool get_bulk_upload_expected_cost(
     return file_count > 0;
 }
 
-const void upload_bulk(const std::vector<std::string>& filtered_filenames, bool allow_2k)
+void upload_bulk(const std::vector<std::string>& filtered_filenames, bool allow_2k, const LLUUID& dest)
 {
     S32 expected_upload_cost;
     S32 expected_upload_count;
@@ -721,6 +727,7 @@ const void upload_bulk(const std::vector<std::string>& filtered_filenames, bool
         key["upload_cost"] = expected_upload_cost;
         key["upload_count"] = expected_upload_count;
         key["has_2k_textures"] = (textures_2k_count > 0);
+        key["dest"] = dest;
 
         LLSD array;
         for (const std::string& str : filtered_filenames)
@@ -754,7 +761,7 @@ const void upload_bulk(const std::vector<std::string>& filtered_filenames, bool
 
 }
 
-const void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter type, bool allow_2k)
+void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter type, bool allow_2k, const LLUUID& dest)
 {
     // TODO:
     // Check user balance for entire cost
@@ -776,7 +783,7 @@ const void upload_bulk(const std::vector<std::string>& filenames, LLFilePicker::
             filtered_filenames.push_back(filename);
         }
     }
-    upload_bulk(filtered_filenames, allow_2k);
+    upload_bulk(filtered_filenames, allow_2k, dest);
 }
 
 class LLFileUploadImage : public view_listener_t
@@ -787,7 +794,7 @@ class LLFileUploadImage : public view_listener_t
         {
             gAgentCamera.changeCameraToDefault();
         }
-        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2), LLFilePicker::FFLOAD_IMAGE, false);
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2, LLUUID::null), LLFilePicker::FFLOAD_IMAGE, false);
         return true;
     }
 };
@@ -818,7 +825,7 @@ class LLFileUploadSound : public view_listener_t
         {
             gAgentCamera.changeCameraToDefault();
         }
-        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2), LLFilePicker::FFLOAD_WAV, false);
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2, LLUUID::null), LLFilePicker::FFLOAD_WAV, false);
         return true;
     }
 };
@@ -831,7 +838,7 @@ class LLFileUploadAnim : public view_listener_t
         {
             gAgentCamera.changeCameraToDefault();
         }
-        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2), LLFilePicker::FFLOAD_ANIM, false);
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_single_file, _1, _2, LLUUID::null), LLFilePicker::FFLOAD_ANIM, false);
         return true;
     }
 };
@@ -844,7 +851,7 @@ class LLFileUploadBulk : public view_listener_t
         {
             gAgentCamera.changeCameraToDefault();
         }
-        LLFilePickerReplyThread::startPicker(boost::bind(&upload_bulk, _1, _2, true), LLFilePicker::FFLOAD_ALL, true);
+        LLFilePickerReplyThread::startPicker(boost::bind(&upload_bulk, _1, _2, true, LLUUID::null), LLFilePicker::FFLOAD_ALL, true);
         return true;
     }
 };
@@ -1132,7 +1139,7 @@ LLUUID upload_new_resource(
         name, desc, compression_info,
         destination_folder_type, inv_type,
         next_owner_perms, group_perms, everyone_perms,
-        expected_upload_cost, show_inventory));
+        expected_upload_cost, LLUUID::null, show_inventory));
     upload_new_resource(uploadInfo, callback, userdata);
 
     return LLUUID::null;
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index d99f9dc4c6..8f7df48a2e 100644
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -74,6 +74,17 @@ bool get_bulk_upload_expected_cost(
 
 void do_bulk_upload(std::vector<std::string> filenames, bool allow_2k);
 
+void upload_single_file(
+    const std::vector<std::string>& filenames,
+    LLFilePicker::ELoadFilter type,
+    const LLUUID& dest);
+
+void upload_bulk(
+    const std::vector<std::string>& filenames,
+    LLFilePicker::ELoadFilter type,
+    bool allow_2k,
+    const LLUUID& dest);
+
 //consider moving all file pickers below to more suitable place
 class LLFilePickerThread : public LLThread
 { //multi-threaded file picker (runs system specific file picker in background and calls "notify" from main thread)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5fd820f91d..3b16708091 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2137,6 +2137,21 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
     EInstantMessage dialog = (EInstantMessage)d;
     LLHost sender = msg->getSender();
 
+    LLSD metadata;
+    if (msg->getNumberOfBlocksFast(_PREHASH_MetaData) > 0)
+    {
+        S32 metadata_size = msg->getSizeFast(_PREHASH_MetaData, 0, _PREHASH_Data);
+        std::string metadata_buffer;
+        metadata_buffer.resize(metadata_size, 0);
+
+        msg->getBinaryDataFast(_PREHASH_MetaData, _PREHASH_Data, &metadata_buffer[0], metadata_size, 0, metadata_size );
+        std::stringstream metadata_stream(metadata_buffer);
+        if (LLSDSerialize::fromBinary(metadata, metadata_stream, metadata_size) == LLSDParser::PARSE_FAILURE)
+        {
+            metadata.clear();
+        }
+    }
+
     LLIMProcessing::processNewMessage(from_id,
         from_group,
         to_id,
@@ -2151,7 +2166,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         position,
         binary_bucket,
         binary_bucket_size,
-        sender);
+        sender,
+        metadata);
 }
 
 void send_do_not_disturb_message (LLMessageSystem* msg, const LLUUID& from_id, const LLUUID& session_id)
@@ -6641,7 +6657,6 @@ void process_initiate_download(LLMessageSystem* msg, void**)
         (void**)new std::string(viewer_filename));
 }
 
-
 void process_script_teleport_request(LLMessageSystem* msg, void**)
 {
     if (!gSavedSettings.getBOOL("ScriptsCanShowUI")) return;
@@ -6655,6 +6670,11 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
     msg->getString("Data", "SimName", sim_name);
     msg->getVector3("Data", "SimPosition", pos);
     msg->getVector3("Data", "LookAt", look_at);
+    U32 flags = (BEACON_SHOW_MAP | BEACON_FOCUS_MAP);
+    if (msg->has("Options"))
+    {
+        msg->getU32("Options", "Flags", flags);
+    }
 
     LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
     if(instance)
@@ -6665,7 +6685,13 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
             << LL_ENDL;
 
         instance->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
-        LLFloaterReg::showInstance("world_map", "center");
+        if (flags & BEACON_SHOW_MAP)
+        {
+            bool old_auto_focus = instance->getAutoFocus();
+            instance->setAutoFocus(flags & BEACON_FOCUS_MAP);
+            instance->openFloater("center");
+            instance->setAutoFocus(old_auto_focus);
+        }
     }
 
     // remove above two lines and replace with below line
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index c5e81dd179..8d90187e91 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2325,6 +2325,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
         // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega)
         setRotation(new_rot * mAngularVelocityRot);
+        if ((mFlags & FLAGS_SERVER_AUTOPILOT) && asAvatar() && asAvatar()->isSelf())
+        {
+            gAgent.resetAxes();
+            gAgent.rotate(new_rot);
+            gAgentCamera.resetView();
+        }
         setChanged(ROTATED | SILHOUETTE);
     }
 
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 8e6657b4b9..1a5c40064a 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1327,12 +1327,12 @@ const S32 LLViewerParcelMgr::getAgentParcelId() const
     return INVALID_PARCEL_ID;
 }
 
-void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region)
+void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel)
 {
     if(!parcel)
         return;
 
-    LLViewerRegion *region = use_agent_region ? gAgent.getRegion() : LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
+    LLViewerRegion *region = LLWorld::getInstance()->getRegionFromID(parcel->getRegionID());
     if (!region)
         return;
 
@@ -1676,10 +1676,16 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
     // Actually extract the data.
     if (parcel)
     {
+        // store region_id in the parcel so we can find it again later
+        LLViewerRegion* parcel_region = LLWorld::getInstance()->getRegion(msg->getSender());
+        if (parcel_region)
+        {
+            parcel->setRegionID(parcel_region->getRegionID());
+        }
+
         if (local_id == parcel_mgr.mAgentParcel->getLocalID())
         {
             // Parcels in different regions can have same ids.
-            LLViewerRegion* parcel_region = LLWorld::getInstance()->getRegion(msg->getSender());
             LLViewerRegion* agent_region = gAgent.getRegion();
             if (parcel_region && agent_region && parcel_region->getRegionID() == agent_region->getRegionID())
             {
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 974ea39359..086bca4878 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -219,7 +219,7 @@ public:
     // containing the southwest corner of the selection.
     // If want_reply_to_update, simulator will send back a ParcelProperties
     // message.
-    void    sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region = false);
+    void    sendParcelPropertiesUpdate(LLParcel* parcel);
 
     // Takes an Access List flag, like AL_ACCESS or AL_BAN
     void    sendParcelAccessListUpdate(U32 which);
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 4a9dd1c1b6..5ba0a86e68 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1107,6 +1107,7 @@ void LLViewerFetchedTexture::init(bool firstinit)
     mOrigHeight = 0;
     mHasAux = false;
     mNeedsAux = false;
+    mLastWorkerDiscardLevel = -1;
     mRequestedDiscardLevel = -1;
     mRequestedDownloadPriority = 0.f;
     mFullyLoaded = false;
@@ -1259,12 +1260,11 @@ void LLViewerFetchedTexture::loadFromFastCache()
 
             if (mBoostLevel == LLGLTexture::BOOST_THUMBNAIL)
             {
-                S32 expected_width = mKnownDrawWidth > 0 ? mKnownDrawWidth : DEFAULT_THUMBNAIL_DIMENSIONS;
-                S32 expected_height = mKnownDrawHeight > 0 ? mKnownDrawHeight : DEFAULT_THUMBNAIL_DIMENSIONS;
-                if (mRawImage && (mRawImage->getWidth() > expected_width || mRawImage->getHeight() > expected_height))
+                if (mRawImage && (mRawImage->getWidth() > DEFAULT_THUMBNAIL_DIMENSIONS || mRawImage->getHeight() > DEFAULT_THUMBNAIL_DIMENSIONS))
                 {
-                    // scale oversized icon, no need to give more work to gl
-                    mRawImage->scale(expected_width, expected_height);
+                    // Scale oversized thumbnail
+                    // thumbnails aren't supposed to go over DEFAULT_THUMBNAIL_DIMENSIONS
+                    mRawImage->scale(DEFAULT_THUMBNAIL_DIMENSIONS, DEFAULT_THUMBNAIL_DIMENSIONS);
                 }
             }
 
@@ -1957,9 +1957,9 @@ bool LLViewerFetchedTexture::processFetchResults(S32& desired_discard, S32 curre
 bool LLViewerFetchedTexture::updateFetch()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-    static LLCachedControl<bool> textures_decode_disabled(gSavedSettings,"TextureDecodeDisabled", false);
+    static LLCachedControl<bool> textures_decode_disabled(gSavedSettings, "TextureDecodeDisabled", false);
 
-    if(textures_decode_disabled) // don't fetch the surface textures in wireframe mode
+    if (textures_decode_disabled) // don't fetch the surface textures in wireframe mode
     {
         return false;
     }
@@ -1994,7 +1994,7 @@ bool LLViewerFetchedTexture::updateFetch()
         LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("vftuf - callback pending");
         return false; // process any raw image data in callbacks before replacing
     }
-    if(mInFastCacheList)
+    if (mInFastCacheList)
     {
         LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("vftuf - in fast cache");
         return false;
@@ -2019,7 +2019,7 @@ bool LLViewerFetchedTexture::updateFetch()
         if (mAuxRawImage.notNull()) sAuxCount--;
         // keep in mind that fetcher still might need raw image, don't modify original
         bool finished = LLAppViewer::getTextureFetch()->getRequestFinished(getID(), fetch_discard, mFetchState, mRawImage, mAuxRawImage,
-                                                                           mLastHttpGetStatus);
+            mLastHttpGetStatus);
         if (mRawImage.notNull()) sRawCount++;
         if (mAuxRawImage.notNull())
         {
@@ -2035,7 +2035,7 @@ bool LLViewerFetchedTexture::updateFetch()
         else
         {
             mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
-                                                                        mFetchPriority, mFetchDeltaTime, mRequestDeltaTime, mCanUseHTTP);
+                mFetchPriority, mFetchDeltaTime, mRequestDeltaTime, mCanUseHTTP);
         }
 
         if (!processFetchResults(desired_discard, current_discard, fetch_discard, decode_priority))
@@ -2046,7 +2046,7 @@ bool LLViewerFetchedTexture::updateFetch()
         if (mIsFetching)
         {
             static const F32 MAX_HOLD_TIME = 5.0f; //seconds to wait before canceling fecthing if decode_priority is 0.f.
-            if(decode_priority > 0.0f || mStopFetchingTimer.getElapsedTimeF32() > MAX_HOLD_TIME)
+            if (decode_priority > 0.0f || mStopFetchingTimer.getElapsedTimeF32() > MAX_HOLD_TIME)
             {
                 mStopFetchingTimer.reset();
                 LLAppViewer::getTextureFetch()->updateRequestPriority(mID, decode_priority);
@@ -2062,7 +2062,7 @@ bool LLViewerFetchedTexture::updateFetch()
         LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("vftuf - priority <= 0");
         make_request = false;
     }
-    else if(mDesiredDiscardLevel > getMaxDiscardLevel())
+    else if (mDesiredDiscardLevel > getMaxDiscardLevel())
     {
         LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("vftuf - desired > max");
         make_request = false;
@@ -2103,7 +2103,7 @@ bool LLViewerFetchedTexture::updateFetch()
     if (make_request)
     {
         LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("vftuf - make request");
-        S32 w=0, h=0, c=0;
+        S32 w = 0, h = 0, c = 0;
         if (getDiscardLevel() >= 0)
         {
             w = mGLTexturep->getWidth(0);
@@ -2121,18 +2121,19 @@ bool LLViewerFetchedTexture::updateFetch()
         S32 fetch_request_response = -1;
         S32 worker_discard = -1;
         fetch_request_response = LLAppViewer::getTextureFetch()->createRequest(mFTType, mUrl, getID(), getTargetHost(), decode_priority,
-                                                                              w, h, c, desired_discard, needsAux(), mCanUseHTTP);
+            w, h, c, desired_discard, needsAux(), mCanUseHTTP);
 
         if (fetch_request_response >= 0) // positive values and 0 are discard values
         {
             LL_PROFILE_ZONE_NAMED_CATEGORY_TEXTURE("vftuf - request created");
             mHasFetcher = true;
             mIsFetching = true;
+            mLastWorkerDiscardLevel = worker_discard;
             // in some cases createRequest can modify discard, as an example
             // bake textures are always at discard 0
             mRequestedDiscardLevel = llmin(desired_discard, fetch_request_response);
             mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
-                                                       mFetchPriority, mFetchDeltaTime, mRequestDeltaTime, mCanUseHTTP);
+                mFetchPriority, mFetchDeltaTime, mRequestDeltaTime, mCanUseHTTP);
         }
         else if (fetch_request_response == LLTextureFetch::CREATE_REQUEST_ERROR_TRANSITION)
         {
@@ -2146,7 +2147,7 @@ bool LLViewerFetchedTexture::updateFetch()
             S32 decoded_discard;
             bool decoded;
             S32 fetch_state = LLAppViewer::getTextureFetch()->getLastFetchState(mID, desired_discard, decoded_discard, decoded);
-            if (fetch_state > 1 && decoded && decoded_discard >=0 && decoded_discard <= desired_discard)
+            if (fetch_state > 1 && decoded && decoded_discard >= 0 && decoded_discard <= desired_discard)
             {
                 // worker actually has the image
                 if (mRawImage.notNull()) sRawCount--;
@@ -2770,11 +2771,9 @@ void LLViewerFetchedTexture::saveRawImage()
     }
     else if (mBoostLevel == LLGLTexture::BOOST_THUMBNAIL)
     {
-        S32 expected_width = mKnownDrawWidth > 0 ? mKnownDrawWidth : DEFAULT_THUMBNAIL_DIMENSIONS;
-        S32 expected_height = mKnownDrawHeight > 0 ? mKnownDrawHeight : DEFAULT_THUMBNAIL_DIMENSIONS;
-        if (mRawImage->getWidth() > expected_width || mRawImage->getHeight() > expected_height)
+        if (mRawImage->getWidth() > DEFAULT_THUMBNAIL_DIMENSIONS || mRawImage->getHeight() > DEFAULT_THUMBNAIL_DIMENSIONS)
         {
-            mSavedRawImage = new LLImageRaw(expected_width, expected_height, mRawImage->getComponents());
+            mSavedRawImage = new LLImageRaw(DEFAULT_THUMBNAIL_DIMENSIONS, DEFAULT_THUMBNAIL_DIMENSIONS, mRawImage->getComponents());
             mSavedRawImage->copyScaled(mRawImage);
         }
         else
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index e1582c74bd..f9311d85cb 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -444,6 +444,7 @@ protected:
     bool mKnownDrawSizeChanged ;
     std::string mUrl;
 
+    S32 mLastWorkerDiscardLevel;
     S32 mRequestedDiscardLevel;
     F32 mRequestedDownloadPriority;
     S32 mFetchState;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index ef6409c23b..50c38899c3 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1424,11 +1424,17 @@ void LLViewerWindow::handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask
 
     mWindow->showCursorFromMouseMove();
 
-    if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME
-        && !gDisconnected)
+    if (!gDisconnected)
+    {
+        if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
     {
         gAgent.clearAFK();
     }
+        else
+        {
+            gAwayTriggerTimer.reset();
+        }
+    }
 }
 
 void LLViewerWindow::handleMouseDragged(LLWindow *window,  LLCoordGL pos, MASK mask)
@@ -1547,6 +1553,10 @@ bool LLViewerWindow::handleTranslatedKeyDown(KEY key,  MASK mask, bool repeated)
     {
         gAgent.clearAFK();
     }
+    else
+    {
+        gAwayTriggerTimer.reset();
+    }
 
     // *NOTE: We want to interpret KEY_RETURN later when it arrives as
     // a Unicode char, not as a keydown.  Otherwise when client frame
@@ -3017,7 +3027,8 @@ bool LLViewerWindow::handleKey(KEY key, MASK mask)
     {
         if ((focusedFloaterName == "nearby_chat") || (focusedFloaterName == "im_container") || (focusedFloaterName == "impanel"))
         {
-            if (gSavedSettings.getBOOL("ArrowKeysAlwaysMove"))
+            LLCachedControl<bool> key_move(gSavedSettings, "ArrowKeysAlwaysMove");
+            if (key_move())
             {
                 // let Control-Up and Control-Down through for chat line history,
                 if (!(key == KEY_UP && mask == MASK_CONTROL)
@@ -3031,10 +3042,9 @@ bool LLViewerWindow::handleKey(KEY key, MASK mask)
                     case KEY_RIGHT:
                     case KEY_UP:
                     case KEY_DOWN:
-                    case KEY_PAGE_UP:
-                    case KEY_PAGE_DOWN:
-                    case KEY_HOME:
-                    case KEY_END:
+                    case KEY_PAGE_UP: //jump
+                    case KEY_PAGE_DOWN: // down
+                    case KEY_HOME: // toggle fly
                         // when chatbar is empty or ArrowKeysAlwaysMove set,
                         // pass arrow keys on to avatar...
                         return false;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 1cca2161fe..3121a9ed8c 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -576,7 +576,7 @@ private:
     // joint states to be animated
     //-------------------------------------------------------------------------
     LLPointer<LLJointState> mPelvisState;
-    LLCharacter*        mCharacter;
+    LLCharacter* mCharacter;
 };
 
 /**
@@ -684,6 +684,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
     mPreviousFullyLoaded(false),
     mFullyLoadedInitialized(false),
     mLastCloudAttachmentCount(-1),
+    mFullyLoadedFrameCounter(0),
     mVisualComplexity(VISUAL_COMPLEXITY_UNKNOWN),
     mLoadedCallbacksPaused(false),
     mLoadedCallbackTextures(0),
@@ -777,11 +778,9 @@ std::string LLVOAvatar::avString() const
     {
         return " " + getFullname() + " ";
     }
-    else
-    {
-        std::string viz_string = LLVOAvatar::rezStatusToString(getRezzedStatus());
-        return " Avatar '" + getFullname() + "' " + viz_string + " ";
-    }
+
+    std::string status = LLVOAvatar::rezStatusToString(getRezzedStatus());
+    return " Avatar '" + getDebugName() + "' " + status + " ";
 }
 
 void LLVOAvatar::debugAvatarRezTime(std::string notification_name, std::string comment)
@@ -804,10 +803,10 @@ void LLVOAvatar::debugAvatarRezTime(std::string notification_name, std::string c
     if (gSavedSettings.getBOOL("DebugAvatarRezTime"))
     {
         LLSD args;
-        args["EXISTENCE"] = llformat("%d",(U32)mDebugExistenceTimer.getElapsedTimeF32());
-        args["TIME"] = llformat("%d",(U32)mRuthDebugTimer.getElapsedTimeF32());
+        args["EXISTENCE"] = llformat("%d", (U32)mDebugExistenceTimer.getElapsedTimeF32());
+        args["TIME"] = llformat("%d", (U32)mRuthDebugTimer.getElapsedTimeF32());
         args["NAME"] = getFullname();
-        LLNotificationsUtil::add(notification_name,args);
+        LLNotificationsUtil::add(notification_name, args);
     }
 }
 
@@ -835,14 +834,14 @@ LLVOAvatar::~LLVOAvatar()
     }
     if (!mFullyLoaded)
     {
-        debugAvatarRezTime("AvatarRezLeftCloudNotification","left after ruth seconds as cloud");
+        debugAvatarRezTime("AvatarRezLeftCloudNotification", "left after ruth seconds as cloud");
     }
     else
     {
-        debugAvatarRezTime("AvatarRezLeftNotification","left sometime after declouding");
+        debugAvatarRezTime("AvatarRezLeftNotification", "left sometime after declouding");
     }
 
-    if(mTuned)
+    if (mTuned)
     {
         LLPerfStats::tunedAvatars--;
         mTuned = false;
@@ -984,7 +983,7 @@ bool LLVOAvatar::areAllNearbyInstancesBaked(S32& grey_avatars)
             ++grey_avatars;
         }
     }
-    return !grey_avatars;
+    return grey_avatars == 0;
 }
 
 // static
@@ -3010,7 +3009,7 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
     if (LLVOAvatar::sJointDebug)
     {
-        LL_INFOS() << getFullname() << ": joint touches: " << LLJoint::sNumTouches << " updates: " << LLJoint::sNumUpdates << LL_ENDL;
+        LL_INFOS() << getDebugName() << ": joint touches: " << LLJoint::sNumTouches << " updates: " << LLJoint::sNumUpdates << LL_ENDL;
     }
 
     LLJoint::sNumUpdates = 0;
@@ -3230,17 +3229,17 @@ F32 LLVOAvatar::calcMorphAmount() const
 void LLVOAvatar::idleUpdateLipSync(bool voice_enabled)
 {
     // Use the Lipsync_Ooh and Lipsync_Aah morphs for lip sync
-    if ( voice_enabled
+    if (voice_enabled
         && mLastRezzedStatus > 0 // no point updating lip-sync for clouds
         && LLVoiceVisualizer::getLipSyncEnabled()
-        && LLVoiceClient::getInstance()->getIsSpeaking( mID ) )
+        && LLVoiceClient::getInstance()->getIsSpeaking(mID))
     {
         F32 ooh_morph_amount = 0.0f;
         F32 aah_morph_amount = 0.0f;
 
         mVoiceVisualizer->lipSyncOohAah( ooh_morph_amount, aah_morph_amount );
 
-        if( mOohMorph )
+        if (mOohMorph)
         {
             F32 ooh_weight = mOohMorph->getMinWeight()
                 + ooh_morph_amount * (mOohMorph->getMaxWeight() - mOohMorph->getMinWeight());
@@ -3248,7 +3247,7 @@ void LLVOAvatar::idleUpdateLipSync(bool voice_enabled)
             mOohMorph->setWeight( ooh_weight);
         }
 
-        if( mAahMorph )
+        if (mAahMorph)
         {
             F32 aah_weight = mAahMorph->getMinWeight()
                 + aah_morph_amount * (mAahMorph->getMaxWeight() - mAahMorph->getMinWeight());
@@ -4335,8 +4334,8 @@ void LLVOAvatar::computeUpdatePeriod()
     {
         const LLVector4a* ext = mDrawable->getSpatialExtents();
         LLVector4a size;
-        size.setSub(ext[1],ext[0]);
-        F32 mag = size.getLength3().getF32()*0.5f;
+        size.setSub(ext[1], ext[0]);
+        F32 mag = size.getLength3().getF32() * 0.5f;
 
         const S32 UPDATE_RATE_SLOW = 64;
         const S32 UPDATE_RATE_MED = 48;
@@ -4346,14 +4345,14 @@ void LLVOAvatar::computeUpdatePeriod()
         {   // visually muted avatars update at lowest rate
             mUpdatePeriod = UPDATE_RATE_SLOW;
         }
-        else if (! shouldImpostor()
-                 || mDrawable->mDistanceWRTCamera < 1.f + mag)
+        else if (!shouldImpostor()
+            || mDrawable->mDistanceWRTCamera < 1.f + mag)
         {   // first 25% of max visible avatars are not impostored
             // also, don't impostor avatars whose bounding box may be penetrating the
             // impostor camera near clip plane
             mUpdatePeriod = 1;
         }
-        else if ( shouldImpostor(4.0) )
+        else if (shouldImpostor(4.0))
         { //background avatars are REALLY slow updating impostors
             mUpdatePeriod = UPDATE_RATE_SLOW;
         }
@@ -4362,7 +4361,7 @@ void LLVOAvatar::computeUpdatePeriod()
             // Don't update cloud avatars too often
             mUpdatePeriod = UPDATE_RATE_SLOW;
         }
-        else if ( shouldImpostor(3.0) )
+        else if (shouldImpostor(3.0))
         { //back 25% of max visible avatars are slow updating impostors
             mUpdatePeriod = UPDATE_RATE_MED;
         }
@@ -6211,8 +6210,11 @@ void LLVOAvatar::resetAnimations()
     flushAllMotions();
 }
 
-// Override selectively based on avatar sex and whether we're using new
-// animations.
+//-----------------------------------------------------------------------------
+// remapMotionID()
+// Override selectively based on avatar sex and whether we're using new animations.
+//-----------------------------------------------------------------------------
+// virtual
 LLUUID LLVOAvatar::remapMotionID(const LLUUID& id)
 {
     static LLCachedControl<bool> use_new_walk_run(gSavedSettings, "UseNewWalkRun");
@@ -6262,7 +6264,6 @@ LLUUID LLVOAvatar::remapMotionID(const LLUUID& id)
     }
 
     return result;
-
 }
 
 //-----------------------------------------------------------------------------
@@ -6270,6 +6271,7 @@ LLUUID LLVOAvatar::remapMotionID(const LLUUID& id)
 // id is the asset if of the animation to start
 // time_offset is the offset into the animation at which to start playing
 //-----------------------------------------------------------------------------
+// virtual
 bool LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
 {
     LL_DEBUGS("Motion") << "motion requested " << id.asString() << " " << gAnimLibrary.animationName(id) << LL_ENDL;
@@ -6292,6 +6294,7 @@ bool LLVOAvatar::startMotion(const LLUUID& id, F32 time_offset)
 //-----------------------------------------------------------------------------
 // stopMotion()
 //-----------------------------------------------------------------------------
+// virtual
 bool LLVOAvatar::stopMotion(const LLUUID& id, bool stop_immediate)
 {
     LL_DEBUGS("Motion") << "Motion requested " << id.asString() << " " << gAnimLibrary.animationName(id) << LL_ENDL;
@@ -6331,6 +6334,7 @@ void LLVOAvatar::stopMotionFromSource(const LLUUID& source_id)
 //-----------------------------------------------------------------------------
 // addDebugText()
 //-----------------------------------------------------------------------------
+// virtual
 void LLVOAvatar::addDebugText(const std::string& text)
 {
     mDebugText.append(1, '\n');
@@ -6338,8 +6342,22 @@ void LLVOAvatar::addDebugText(const std::string& text)
 }
 
 //-----------------------------------------------------------------------------
+// getDebugName()
+//-----------------------------------------------------------------------------
+// virtual
+std::string LLVOAvatar::getDebugName() const
+{
+#if LL_RELEASE_WITH_DEBUG_INFO
+    return getFullname();
+#else
+    return getID().asString();
+#endif // LL_RELEASE_WITH_DEBUG_INFO
+}
+
+//-----------------------------------------------------------------------------
 // getID()
 //-----------------------------------------------------------------------------
+// virtual
 const LLUUID& LLVOAvatar::getID() const
 {
     return mID;
@@ -6349,6 +6367,7 @@ const LLUUID& LLVOAvatar::getID() const
 // getJoint()
 //-----------------------------------------------------------------------------
 // RN: avatar joints are multi-rooted to include screen-based attachments
+// virtual
 LLJoint *LLVOAvatar::getJoint( const std::string &name )
 {
     joint_map_t::iterator iter = mJointMap.find(name);
@@ -6464,6 +6483,7 @@ bool LLVOAvatar::jointIsRiggedTo(const LLJoint *joint) const
 
 void LLVOAvatar::clearAttachmentOverrides()
 {
+
     for (S32 i=0; i<LL_CHARACTER_MAX_ANIMATED_JOINTS; i++)
     {
         LLJoint *pJoint = getJoint(i);
@@ -6494,6 +6514,7 @@ void LLVOAvatar::clearAttachmentOverrides()
 //-----------------------------------------------------------------------------
 void LLVOAvatar::rebuildAttachmentOverrides()
 {
+
     LL_DEBUGS("AnimatedObjects") << "rebuilding" << LL_ENDL;
 
     clearAttachmentOverrides();
@@ -6542,6 +6563,7 @@ void LLVOAvatar::rebuildAttachmentOverrides()
 // -----------------------------------------------------------------------------
 void LLVOAvatar::updateAttachmentOverrides()
 {
+
     LL_DEBUGS("AnimatedObjects") << "updating" << LL_ENDL;
 
     std::set<LLUUID> meshes_seen;
@@ -6617,11 +6639,11 @@ void LLVOAvatar::updateAttachmentOverrides()
             }
         }
         pelvis_fixups = mPelvisFixups;
-        //dumpArchetypeXML(getFullname() + "_paranoid_updated");
+        //dumpArchetypeXML(getDebugName() + "_paranoid_updated");
 
         // Rebuild and compare
         rebuildAttachmentOverrides();
-        //dumpArchetypeXML(getFullname() + "_paranoid_rebuilt");
+        //dumpArchetypeXML(getDebugName() + "_paranoid_rebuilt");
         bool mismatched = false;
         for (S32 joint_num = 0; joint_num < LL_CHARACTER_MAX_ANIMATED_JOINTS; joint_num++)
         {
@@ -6850,22 +6872,22 @@ void LLVOAvatar::showAttachmentOverrides(bool verbose) const
     {
         std::stringstream ss;
         std::copy(pos_names.begin(), pos_names.end(), std::ostream_iterator<std::string>(ss, ","));
-        LL_INFOS() << getFullname() << " attachment positions defined for joints: " << ss.str() << "\n" << LL_ENDL;
+        LL_INFOS() << avString() << " attachment positions defined for joints: " << ss.str() << "\n" << LL_ENDL;
     }
     else
     {
-        LL_DEBUGS("Avatar") << getFullname() << " no attachment positions defined for any joints" << "\n" << LL_ENDL;
+        LL_DEBUGS("Avatar") << avString() << " no attachment positions defined for any joints" << "\n" << LL_ENDL;
     }
 
     if (scale_names.size())
     {
         std::stringstream ss;
         std::copy(scale_names.begin(), scale_names.end(), std::ostream_iterator<std::string>(ss, ","));
-        LL_INFOS() << getFullname() << " attachment scales defined for joints: " << ss.str() << "\n" << LL_ENDL;
+        LL_INFOS() << getDebugName() << " attachment scales defined for joints: " << ss.str() << "\n" << LL_ENDL;
     }
     else
     {
-        LL_INFOS() << getFullname() << " no attachment scales defined for any joints" << "\n" << LL_ENDL;
+        LL_INFOS() << getDebugName() << " no attachment scales defined for any joints" << "\n" << LL_ENDL;
     }
 
     if (!verbose)
@@ -8252,7 +8274,7 @@ bool LLVOAvatar::getIsCloud() const
 void LLVOAvatar::updateRezzedStatusTimers(S32 rez_status)
 {
     // State machine for rezzed status. Statuses are -1 on startup, 0
-    // = cloud, 1 = gray, 2 = downloading, 3 = waiting for attachments, 4 = full.
+    // Statuses are -1 on startup, 0 = cloud, 1 = gray, 2 = downloading, 3 = waiting for attachments, 4 = full.
     // Purpose is to collect time data for each it takes avatar to reach
     // various loading landmarks: gray, textured (partial), textured fully.
 
@@ -8272,7 +8294,7 @@ void LLVOAvatar::updateRezzedStatusTimers(S32 rez_status)
         if (rez_status < mLastRezzedStatus)
         {
             // load level has decreased. start phase timers for higher load levels.
-            for (S32 i = rez_status+1; i <= mLastRezzedStatus; i++)
+            for (S32 i = rez_status + 1; i <= mLastRezzedStatus; i++)
             {
                 startPhase("load_" + LLVOAvatar::rezStatusToString(i));
             }
@@ -8280,7 +8302,7 @@ void LLVOAvatar::updateRezzedStatusTimers(S32 rez_status)
         else if (rez_status > mLastRezzedStatus)
         {
             // load level has increased. stop phase timers for lower and equal load levels.
-            for (S32 i = llmax(mLastRezzedStatus+1,1); i <= rez_status; i++)
+            for (S32 i = llmax(mLastRezzedStatus + 1, 1); i <= rez_status; i++)
             {
                 stopPhase("load_" + LLVOAvatar::rezStatusToString(i));
                 stopPhase("first_load_" + LLVOAvatar::rezStatusToString(i), false);
@@ -8521,19 +8543,19 @@ bool LLVOAvatar::processFullyLoadedChange(bool loading)
         F32 first_use_delay = FIRST_APPEARANCE_CLOUD_MIN_DELAY;
         if (!isSelf() && loading)
         {
-                // Note that textures can causes 60s delay on thier own
-                // so this delay might end up on top of textures' delay
-                first_use_delay = llclamp(
-                    mFirstAppearanceMessageTimer.getElapsedTimeF32(),
-                    FIRST_APPEARANCE_CLOUD_MIN_DELAY,
-                    FIRST_APPEARANCE_CLOUD_MAX_DELAY);
+            // Note that textures can causes 60s delay on thier own
+            // so this delay might end up on top of textures' delay
+            first_use_delay = llclamp(
+                mFirstAppearanceMessageTimer.getElapsedTimeF32(),
+                FIRST_APPEARANCE_CLOUD_MIN_DELAY,
+                FIRST_APPEARANCE_CLOUD_MAX_DELAY);
 
-                if (shouldImpostor())
-                {
-                    // Impostors are less of a priority,
-                    // let them stay cloud longer
-                    first_use_delay *= FIRST_APPEARANCE_CLOUD_IMPOSTOR_MODIFIER;
-                }
+            if (shouldImpostor())
+            {
+                // Impostors are less of a priority,
+                // let them stay cloud longer
+                first_use_delay *= FIRST_APPEARANCE_CLOUD_IMPOSTOR_MODIFIER;
+            }
         }
         mFullyLoaded = (mFullyLoadedTimer.getElapsedTimeF32() > first_use_delay);
     }
@@ -8550,12 +8572,12 @@ bool LLVOAvatar::processFullyLoadedChange(bool loading)
     // did our loading state "change" from last call?
     // FIXME runway - why are we updating every 30 calls even if nothing has changed?
     // This causes updateLOD() to run every 30 frames, among other things.
+    bool fully_loaded_changed = (mFullyLoaded != mPreviousFullyLoaded);
     const S32 UPDATE_RATE = 30;
     bool changed =
         ((mFullyLoaded != mPreviousFullyLoaded) ||         // if the value is different from the previous call
-         (!mFullyLoadedInitialized) ||                     // if we've never been called before
-         (mFullyLoadedFrameCounter % UPDATE_RATE == 0));   // every now and then issue a change
-    bool fully_loaded_changed = (mFullyLoaded != mPreviousFullyLoaded);
+            (!mFullyLoadedInitialized) ||                     // if we've never been called before
+            (mFullyLoadedFrameCounter % UPDATE_RATE == 0));   // every now and then issue a change
 
     mPreviousFullyLoaded = mFullyLoaded;
     mFullyLoadedInitialized = true;
@@ -8573,6 +8595,7 @@ bool LLVOAvatar::processFullyLoadedChange(bool loading)
         mNeedsImpostorUpdate = true;
         mLastImpostorUpdateReason = 6;
     }
+
     return changed;
 }
 
@@ -9467,12 +9490,12 @@ void dump_visual_param(apr_file_t* file, LLVisualParam* viewer_param, F32 value)
 void LLVOAvatar::dumpAppearanceMsgParams( const std::string& dump_prefix,
     const LLAppearanceMessageContents& contents)
 {
-    std::string outfilename = get_sequential_numbered_file_name(dump_prefix,".xml");
+    std::string outfilename = get_sequential_numbered_file_name(dump_prefix, ".xml");
     const std::vector<F32>& params_for_dump = contents.mParamWeights;
     const LLTEContents& tec = contents.mTEContents;
 
     LLAPRFile outfile;
-    std::string fullpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,outfilename);
+    std::string fullpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, outfilename);
     outfile.open(fullpath, LL_APR_WB );
     apr_file_t* file = outfile.getFileHandle();
     if (!file)
@@ -9685,7 +9708,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
     static LLCachedControl<bool> enable_verbose_dumps(gSavedSettings, "DebugAvatarAppearanceMessage");
     static LLCachedControl<bool> block_avatar_appearance_messages(gSavedSettings, "BlockAvatarAppearanceMessages");
 
-    std::string dump_prefix = getFullname() + "_" + (isSelf()?"s":"o") + "_";
+    std::string dump_prefix = getDebugName() + (isSelf() ? "_s_" : "_o_");
     if (block_avatar_appearance_messages)
     {
         LL_WARNS() << "Blocking AvatarAppearance message" << LL_ENDL;
@@ -10319,17 +10342,13 @@ void LLVOAvatar::dumpArchetypeXML(const std::string& prefix, bool group_by_weara
     std::string outprefix(prefix);
     if (outprefix.empty())
     {
-        outprefix = getFullname() + (isSelf()?"_s":"_o");
+        outprefix = getDebugName() + (isSelf() ? "_s" : "_o");
     }
-    if (outprefix.empty())
-    {
-        outprefix = std::string("new_archetype");
-    }
-    std::string outfilename = get_sequential_numbered_file_name(outprefix,".xml");
+    std::string outfilename = get_sequential_numbered_file_name(outprefix, ".xml");
 
     LLAPRFile outfile;
     LLWearableType *wr_inst = LLWearableType::getInstance();
-    std::string fullpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,outfilename);
+    std::string fullpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, outfilename);
     if (APR_SUCCESS == outfile.open(fullpath, LL_APR_WB ))
     {
         apr_file_t* file = outfile.getFileHandle();
@@ -10815,7 +10834,7 @@ void LLVOAvatar::updateRiggingInfo()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_AVATAR;
 
-    LL_DEBUGS("RigSpammish") << getFullname() << " updating rig tab" << LL_ENDL;
+    LL_DEBUGS("RigSpammish") << getDebugName() << " updating rig tab" << LL_ENDL;
 
     // use a local static for scratch space to avoid reallocation here
     static std::vector<LLVOVolume*> volumes;
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index a2232d21a2..6765b1fc5b 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -232,6 +232,7 @@ public:
     virtual void            onActiveOverrideMeshesChanged();
 
     /*virtual*/ const LLUUID&   getID() const;
+    /*virtual*/ std::string     getDebugName() const;
     /*virtual*/ void            addDebugText(const std::string& text);
     /*virtual*/ F32             getTimeDilation();
     /*virtual*/ void            getGround(const LLVector3 &inPos, LLVector3 &outPos, LLVector3 &outNorm);
@@ -329,16 +330,16 @@ public:
 
 
     // avatar render cost
-    U32             getVisualComplexity()           { return mVisualComplexity;             };
+    U32             getVisualComplexity()           { return mVisualComplexity; };
 
     // surface area calculation
-    F32             getAttachmentSurfaceArea()      { return mAttachmentSurfaceArea;        };
+    F32             getAttachmentSurfaceArea()      { return mAttachmentSurfaceArea; };
 
-    U32             getReportedVisualComplexity()                   { return mReportedVisualComplexity;             };  // Numbers as reported by the SL server
-    void            setReportedVisualComplexity(U32 value)          { mReportedVisualComplexity = value;            };
+    U32             getReportedVisualComplexity()   { return mReportedVisualComplexity; };  // Numbers as reported by the SL server
+    void            setReportedVisualComplexity(U32 value) { mReportedVisualComplexity = value; };
 
-    S32             getUpdatePeriod()               { return mUpdatePeriod;         };
-    const LLColor4 &  getMutedAVColor()             { return mMutedAVColor;         };
+    S32             getUpdatePeriod()               { return mUpdatePeriod; };
+    const LLColor4 &  getMutedAVColor()             { return mMutedAVColor; };
     static void     updateImpostorRendering(U32 newMaxNonImpostorsValue);
 
     void            idleUpdateBelowWater();
@@ -402,12 +403,11 @@ public:
     virtual bool    getIsCloud() const;
     bool            isFullyTextured() const;
     bool            hasGray() const;
-    S32             getRezzedStatus() const; // 0 = cloud, 1 = gray, 2 = textured, 3 = textured and fully downloaded.
+    S32             getRezzedStatus() const; // 0 = cloud, 1 = gray, 2 = textured, 3 = waiting for attachments, 4 = full.
     void            updateRezzedStatusTimers(S32 status);
 
     S32             mLastRezzedStatus;
 
-
     void            startPhase(const std::string& phase_name);
     void            stopPhase(const std::string& phase_name, bool err_check = true);
     void            clearPhases();
@@ -741,7 +741,7 @@ protected:
     LLViewerTexLayerSet*  getTexLayerSet(const U32 index) const { return dynamic_cast<LLViewerTexLayerSet*>(mBakedTextureDatas[index].mTexLayerSet);    }
 
 
-    LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ;
+    LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList;
     bool mLoadedCallbacksPaused;
     S32 mLoadedCallbackTextures; // count of 'loaded' baked textures, filled from mCallbackTextureList
     LLFrameTimer mLastTexCallbackAddedTime;
diff --git a/indra/newview/llvoicecallhandler.cpp b/indra/newview/llvoicecallhandler.cpp
index 25b0e69436..d2c947fef2 100644
--- a/indra/newview/llvoicecallhandler.cpp
+++ b/indra/newview/llvoicecallhandler.cpp
@@ -38,6 +38,11 @@ public:
     {
     }
 
+    virtual bool canHandleUntrusted(const LLSD &params, const LLSD &query_map, LLMediaCtrl *web, const std::string &nav_type)
+    {
+        return (nav_type == NAV_TYPE_CLICKED || nav_type == NAV_TYPE_EXTERNAL);
+    }
+
     bool handle(const LLSD& params, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
     {
         //Make sure we have some parameters
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index cf128f381a..b3ac28eb7a 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -369,6 +369,12 @@ void LLVoiceChannel::resume()
         {
             if (sSuspendedVoiceChannel)
             {
+                if (sSuspendedVoiceChannel->callStarted())
+                {
+                    // should have channel data already, restart
+                    sSuspendedVoiceChannel->setState(STATE_READY);
+                }
+                // won't do anything if call is already started
                 sSuspendedVoiceChannel->activate();
             }
             else
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3fb7a3c156..4867a5c279 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1481,6 +1481,7 @@ bool LLVOVolume::calcLOD()
             const LLVector3* box = avatar->getLastAnimExtents();
             LLVector3 diag = box[1] - box[0];
             radius = diag.magVec() * 0.5f;
+            LL_DEBUGS("DynamicBox") << avatar->getDebugName() << " diag " << diag << " radius " << radius << LL_ENDL;
         }
         else
         {
@@ -1491,6 +1492,7 @@ bool LLVOVolume::calcLOD()
             const LLVector3* box = avatar->getLastAnimExtents();
             LLVector3 diag = box[1] - box[0];
             radius = diag.magVec(); // preserve old BinRadius behavior - 2x off
+            LL_DEBUGS("DynamicBox") << avatar->getDebugName() << " diag " << diag << " radius " << radius << LL_ENDL;
         }
         if (distance <= 0.f || radius <= 0.f)
         {
@@ -1555,11 +1557,16 @@ bool LLVOVolume::calcLOD()
 
     mLODAdjustedDistance = distance;
 
+    static LLCachedControl<S32> debug_selection_lods(gSavedSettings, "DebugSelectionLODs", 0);
     if (isHUDAttachment())
     {
         // HUDs always show at highest detail
         cur_detail = 3;
     }
+    else if (isSelected() && debug_selection_lods() >= 0)
+    {
+        cur_detail = llmin(debug_selection_lods(), 3);
+    }
     else
     {
         cur_detail = computeLODDetail(ll_round(distance, 0.01f), ll_round(radius, 0.01f), lod_factor);
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 8ce1a745c3..8b0492ceed 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -195,6 +195,7 @@ LLPanelWearableOutfitItem::LLPanelWearableOutfitItem(LLViewerInventoryItem* item
 
 // virtual
 void LLPanelWearableOutfitItem::updateItem(const std::string& name,
+                                           bool favorite,
                                            EItemState item_state)
 {
     std::string search_label = name;
@@ -225,7 +226,7 @@ void LLPanelWearableOutfitItem::updateItem(const std::string& name,
         }
     }
 
-    LLPanelInventoryListItemBase::updateItem(search_label, item_state);
+    LLPanelInventoryListItemBase::updateItem(search_label, favorite, item_state);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -452,6 +453,7 @@ LLPanelAttachmentListItem* LLPanelAttachmentListItem::create(LLViewerInventoryIt
 }
 
 void LLPanelAttachmentListItem::updateItem(const std::string& name,
+                                           bool favorite,
                                            EItemState item_state)
 {
     std::string title_joint = name;
@@ -469,7 +471,7 @@ void LLPanelAttachmentListItem::updateItem(const std::string& name,
         title_joint =  title_joint + " (" + trans_name + ")";
     }
 
-    LLPanelInventoryListItemBase::updateItem(title_joint, item_state);
+    LLPanelInventoryListItemBase::updateItem(title_joint, favorite, item_state);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -497,7 +499,7 @@ bool LLPanelDummyClothingListItem::postBuild()
     addWidgetToRightSide("btn_add_panel");
 
     setIconImage(LLInventoryIcon::getIcon(LLAssetType::AT_CLOTHING, LLInventoryType::IT_NONE, mWearableType, false));
-    updateItem(wearableTypeToString(mWearableType));
+    updateItem(wearableTypeToString(mWearableType), false);
 
     // Make it look loke clothing item - reserve space for 'delete' button
     setLeftWidgetsWidth(getChildView("item_icon")->getRect().mLeft);
@@ -931,8 +933,8 @@ LLContextMenu* LLWearableItemsList::ContextMenu::createMenu()
     registrar.add("Wearable.CreateNew", boost::bind(createNewWearable, selected_id));
     registrar.add("Wearable.ShowOriginal", boost::bind(show_item_original, selected_id));
     registrar.add("Wearable.TakeOffDetach",
-                  boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), ids, no_op));
 
+                  boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), ids, no_op));
     // Register handlers for clothing.
     registrar.add("Clothing.TakeOff",
                   boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), ids, no_op));
@@ -942,6 +944,7 @@ LLContextMenu* LLWearableItemsList::ContextMenu::createMenu()
     // Register handlers for attachments.
     registrar.add("Attachment.Detach",
                   boost::bind(&LLAppearanceMgr::removeItemsFromAvatar, LLAppearanceMgr::getInstance(), ids, no_op));
+    registrar.add("Attachment.Favorite", boost::bind(toggle_favorites, ids));
     registrar.add("Attachment.Touch", boost::bind(handle_attachment_touch, selected_id));
     registrar.add("Attachment.Profile", boost::bind(show_item_profile, selected_id));
     registrar.add("Object.Attach", boost::bind(LLViewerAttachMenu::attachObjects, ids, _2));
@@ -975,6 +978,8 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
     U32 n_touchable = 0;                        // number of touchable items among the selected ones
 
     bool can_be_worn = true;
+    bool can_favorite = false;
+    bool can_unfavorite = false;
 
     for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it)
     {
@@ -996,6 +1001,12 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
         const bool is_editable = get_is_item_editable(id);
         const bool is_touchable = enable_attachment_touch(id);
         const bool is_already_worn = gAgentWearables.selfHasWearable(wearable_type);
+
+        LLUUID linked_id = item->getLinkedUUID();
+        LLViewerInventoryItem* linked_item = gInventory.getItem(linked_id);
+        can_favorite |= !linked_item->getIsFavorite();
+        can_unfavorite |= linked_item->getIsFavorite();
+
         if (is_worn)
         {
             ++n_worn;
@@ -1019,7 +1030,7 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
 
         if (can_be_worn)
         {
-            can_be_worn = get_can_item_be_worn(item->getLinkedUUID());
+            can_be_worn = get_can_item_be_worn(linked_id);
         }
     } // for
 
@@ -1041,6 +1052,8 @@ void LLWearableItemsList::ContextMenu::updateItemsVisibility(LLContextMenu* menu
     setMenuItemEnabled(menu, "create_new",          LLAppearanceMgr::instance().canAddWearables(ids));
     setMenuItemVisible(menu, "show_original",       !standalone);
     setMenuItemEnabled(menu, "show_original",       n_items == 1 && n_links == n_items);
+    setMenuItemVisible(menu, "favorites_add",       can_favorite);
+    setMenuItemVisible(menu, "favorites_remove",    can_unfavorite);
     setMenuItemVisible(menu, "take_off",            mask == MASK_CLOTHING && n_worn == n_items);
     setMenuItemVisible(menu, "detach",              mask == MASK_ATTACHMENT && n_worn == n_items);
     setMenuItemVisible(menu, "take_off_or_detach",  mask == (MASK_ATTACHMENT|MASK_CLOTHING));
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index 3fe1059176..7ba64c90da 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -94,6 +94,7 @@ public:
      * Updates item name and (worn) suffix.
      */
     /*virtual*/ void updateItem(const std::string& name,
+                                bool favorite,
                                 EItemState item_state = IS_DEFAULT);
 
     void onAddWearable();
@@ -147,6 +148,7 @@ public:
 
     /** Set item title. Joint name is added to the title in parenthesis */
     /*virtual*/ void updateItem(const std::string& name,
+                                bool favorite,
                                 EItemState item_state = IS_DEFAULT);
 
 protected:
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 076459a7b2..6b3a5b1892 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -121,7 +121,7 @@
 
 #include "SMAAAreaTex.h"
 #include "SMAASearchTex.h"
-
+#include "llerror.h"
 #ifndef LL_WINDOWS
 #define A_GCC 1
 #pragma GCC diagnostic ignored "-Wunused-function"
@@ -601,7 +601,6 @@ void LLPipeline::init()
     connectRefreshCachedSettingsSafe("RenderMirrors");
     connectRefreshCachedSettingsSafe("RenderHeroProbeUpdateRate");
     connectRefreshCachedSettingsSafe("RenderHeroProbeConservativeUpdateMultiplier");
-    connectRefreshCachedSettingsSafe("RenderAutoHideSurfaceAreaLimit");
 
     LLPointer<LLControlVariable> cntrl_ptr = gSavedSettings.getControl("CollectFontVertexBuffers");
     if (cntrl_ptr.notNull())
@@ -1291,8 +1290,11 @@ void LLPipeline::createGLBuffers()
     }
 
     allocateScreenBuffer(resX, resY);
-    mRT->width = 0;
-    mRT->height = 0;
+    // Do not zero out mRT dimensions here. allocateScreenBuffer() above
+    // already sets the correct dimensions. Zeroing them caused resizeShadowTexture()
+    // to fail if called immediately after createGLBuffers (e.g., post graphics change).
+    // mRT->width = 0;
+    // mRT->height = 0;
 
 
     if (!mNoiseMap)
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index bc9aef8974..f5d10ee8d2 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -458,6 +458,9 @@
      name="InventoryBackgroundColor"
      reference="DkGray2" />
     <color
+     name="InventoryFavoriteColor"
+     reference="Yellow" />
+    <color
      name="InventoryFocusOutlineColor"
      reference="White_25" />
     <color
diff --git a/indra/newview/skins/default/textures/icons/Icon_Pointer.png b/indra/newview/skins/default/textures/icons/Icon_Pointer.png
new file mode 100644
index 0000000000..021942a8aa
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Icon_Pointer.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png
new file mode 100644
index 0000000000..b71b202234
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Content.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png
new file mode 100644
index 0000000000..7d55fb5cfe
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Inv_Favorite_Star_Full.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index f824816183..64e2b417fa 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -87,7 +87,7 @@ with the same filename but different name
   <texture name="BreadCrumbBtn_Left_Off" file_name="widgets/BreadCrumbBtn_Left_Off.png" preload="false"/>
   <texture name="BreadCrumbBtn_Left_Over" file_name="widgets/BreadCrumbBtn_Left_Over.png" preload="false"/>
   <texture name="BreadCrumbBtn_Left_Press" file_name="widgets/BreadCrumbBtn_Left_Press.png" preload="false"/>
-
+ 
   <texture name="BreadCrumbBtn_Middle_Disabled" file_name="widgets/BreadCrumbBtn_Middle_Disabled.png" preload="false"/>
   <texture name="BreadCrumbBtn_Middle_Off" file_name="widgets/BreadCrumbBtn_Middle_Off.png" preload="false"/>
   <texture name="BreadCrumbBtn_Middle_Over" file_name="widgets/BreadCrumbBtn_Middle_Over.png" preload="false"/>
@@ -194,7 +194,7 @@ with the same filename but different name
 
   <texture name="Copy" file_name="icons/Copy.png" preload="false" />
   <texture name="CopyBright" file_name="icons/CopyBright.png" preload="false" />
-
+  
   <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
 
   <texture name="ChatBarHandle" file_name="bottomtray/ChatBarHandle.png" preload="false" />
@@ -246,7 +246,7 @@ with the same filename but different name
   <texture name="Group_Notices" file_name="icons/Group_Notices.png" preload="false" />
 
   <texture name="Hand" file_name="icons/hand.png" preload="false" />
-
+  
   <texture name="Help_Press" file_name="navbar/Help_Press.png" preload="false" />
 
   <texture name="Hierarchy_View_Disabled" file_name="icons/Hierarchy_View_Disabled.png" preload="false" />
@@ -259,16 +259,16 @@ with the same filename but different name
   <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
   <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
   <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" />
-
+  
   <texture name="Icon_Copy" file_name="icons/copy_clipboard.png" preload="true" />
-
+  
   <texture name="Icon_Delete" file_name="icons/delete_icon.png" preload="true" />
 
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
   <texture name="Icon_File_Upload" file_name="icons/file_upload.png" preload="true" />
-
+  
   <texture name="Icon_For_Sale" file_name="icons/Icon_For_Sale.png" preload="false" />
 
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
@@ -281,14 +281,14 @@ with the same filename but different name
 
   <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
   <texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" />
-
+  
   <texture name="Icon_Paste" file_name="icons/paste_clipboard.png" preload="true" />
 
   <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
   <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
 
   <texture name="Icon_Snapshot" file_name="icons/snapshot_icon.png" preload="true" />
-
+  
   <texture name="Icon_Use_Texture" file_name="icons/texture_icon.png" preload="true" />
 
   <texture name="Info" file_name="icons/Info.png" preload="false" />
@@ -308,6 +308,8 @@ with the same filename but different name
   <texture name="Inv_CallingCard" file_name="icons/Inv_CallingCard.png" preload="false" />
   <texture name="Inv_Clothing" file_name="icons/Inv_Clothing.png" preload="false" />
   <texture name="Inv_Eye" file_name="icons/Inv_Eye.png" preload="false" />
+  <texture name="Inv_Favorite_Star_Content" file_name="icons/Inv_Favorite_Star_Content.png" preload="false" />
+  <texture name="Inv_Favorite_Star_Full" file_name="icons/Inv_Favorite_Star_Full.png" preload="false" />
   <texture name="Inv_FolderClosed" file_name="icons/Inv_FolderClosed.png" preload="false" />
   <texture name="Inv_FolderOpen" file_name="icons/Inv_FolderOpen.png" preload="false" />
   <texture name="Inv_Gesture" file_name="icons/Inv_Gesture.png" preload="false" />
@@ -322,7 +324,7 @@ with the same filename but different name
   <texture name="Inv_LostOpen" file_name="icons/Inv_LostOpen.png" preload="false" />
   <texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" />
   <texture name="Inv_Material" file_name="icons/Inv_Material.png" preload="false" />
-  <texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" />
+  <texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" />  
   <texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" />
   <texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" />
   <texture name="Inv_Object_Multi" file_name="icons/Inv_Object_Multi.png" preload="false" />
@@ -377,7 +379,7 @@ with the same filename but different name
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
   <texture name="Map_Placeholder_Icon" file_name="icons/map_placeholder.png" preload="true" />
-
+    
   <texture name="Marketplace_Dropzone_Background" file_name="widgets/Marketplace_Dropzone_Background.png" preload="true" />
   <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
   <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
@@ -393,7 +395,7 @@ with the same filename but different name
   <texture name="ModelImport_Status_Good" file_name="green_checkmark.png" preload="false"/>
   <texture name="ModelImport_Status_Warning" file_name="lag_status_warning.tga" preload="false"/>
   <texture name="ModelImport_Status_Error" file_name="red_x.png" preload="false"/>
-
+  
   <texture name="MouseLook_View_Off" file_name="bottomtray/Mouselook_View_Off.png" preload="false" />
   <texture name="MouseLook_View_On" file_name="bottomtray/Mouselook_View_On.png" preload="false" />
 
@@ -549,7 +551,7 @@ with the same filename but different name
   <texture name="Profile_Perm_Objects_Enabled" file_name="icons/Profile_Perm_Objects_Enabled.png" preload="true"/>
   <texture name="Profile_Perm_Online_Disabled" file_name="icons/Profile_Perm_Online_Disabled.png" preload="true"/>
   <texture name="Profile_Perm_Online_Enabled" file_name="icons/Profile_Perm_Online_Enabled.png" preload="true"/>
-
+  
   <texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
   <texture name="ProgressBarSolid" file_name="widgets/ProgressBarSolid.png" preload="true" scale.left="4" scale.top="11" scale.right="48" scale.bottom="3" />
   <texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
@@ -742,7 +744,7 @@ with the same filename but different name
   <texture name="UpArrow_Off" file_name="icons/UpArrow_Off.png" preload="false" />
 
   <texture name="Video_URL_Off" file_name="icons/Video_URL_Off.png" preload="true" />
-
+  
   <texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png" scale.left="2" scale.right="7" scale.bottom="8" scale.top="120"  scale_type="scale_outer"/>
 
     <texture name="VirtualTrackball_Moon_Back" file_name="widgets/track_control_moon_back.png" />
@@ -758,7 +760,7 @@ with the same filename but different name
   <texture name="VirtualTrackball_Sphere" file_name="widgets/track_control_sphere.png" />
   <texture name="VirtualTrackball_Sun_Back" file_name="widgets/track_control_sun_back.png" />
   <texture name="VirtualTrackball_Sun_Front" file_name="widgets/track_control_sun_front.png" />
-
+    
     <texture name="Volume_Background" file_name="windows/Volume_Background.png" preload="false"
            scale.left="6" scale.top="33" scale.right="63" scale.bottom="10" />
 
@@ -767,7 +769,7 @@ with the same filename but different name
   <texture name="VoicePTT_Lvl3" file_name="bottomtray/VoicePTT_Lvl3.png" preload="false" />
   <texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" />
   <texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" />
-
+  
   <texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" />
 
   <texture name="Add_Icon" file_name="icons/add_icon.png" preload="false" />
@@ -882,7 +884,7 @@ with the same filename but different name
   <texture name="buy_off" file_name="widgets/buy_off.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/>
   <texture name="buy_over" file_name="widgets/buy_over.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/>
   <texture name="buy_press" file_name="widgets/buy_press.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/>
-
+  
   <texture name="hint_background" file_name="windows/hint_background.png" preload="false" scale.left="8" scale.top="70" scale.right="195" scale.bottom="11"/>
   <texture name="hint_arrow_left" file_name="windows/hint_arrow_left.png" preload="false"/>
   <texture name="hint_arrow_right" file_name="windows/hint_arrow_right.png" preload="false"/>
@@ -931,4 +933,5 @@ with the same filename but different name
   <texture name="ProgressLarge_11" file_name="icons/ProgressLarge_11.png" preload="true" />
   <texture name="ProgressLarge_12" file_name="icons/ProgressLarge_12.png" preload="true" />
 
+  <texture name="Icon_Pointer" file_name="icons/Icon_Pointer.png" preload="false"/>
 </textures>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index a7dff91311..038a2e0fcd 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -3723,6 +3723,10 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE].
 	<string name="conference-title-incoming">
 		Konference med [AGENT_NAME]
 	</string>
+	<string name="bot_warning">
+Du chatter med en bot, [NAME]. Del ikke personlige oplysninger.
+Læs mere på https://second.life/scripted-agents.
+	</string>
 	<string name="no_session_message">
 		(IM session eksisterer ikke)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index 602424821f..09447cbbaf 100644
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		<combo_box.item label="Klein (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
-		<combo_box.item label="Aktuelles Fenster (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
 	<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
index dab20d63eb..2a51f10894 100644
--- a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="Auf Datenträger speichern" name="save_to_computer_btn"/>
-	<button label="In Inventar speichern ([AMOUNT] L$)" name="save_to_inventory_btn"/>
+	<button label="In Inventar speichern" name="save_to_inventory_btn"/>
 	<button label="Im Profil-Feed teilen" name="save_to_profile_btn"/>
 	<button label="Auf Facebook teilen" name="send_to_facebook_btn"/>
 	<button label="Auf Twitter teilen" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 4bed43dd1d..c7f664f29b 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1613,6 +1613,10 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="conference-title-incoming">Konferenz mit [AGENT_NAME]</string>
 	<string name="inventory_item_offered-im">Inventarobjekt „[ITEM_NAME]“ angeboten</string>
 	<string name="inventory_folder_offered-im">Inventarordner „[ITEM_NAME]“ angeboten</string>
+	<string name="bot_warning">
+	Sie chatten mit einem Bot, [NAME]. Geben Sie keine persönlichen Informationen weiter.
+Erfahren Sie mehr unter https://second.life/scripted-agents.
+	</string>
 	<string name="share_alert">Objekte aus dem Inventar hier her ziehen</string>
 	<string name="facebook_post_success">Sie haben auf Facebook gepostet.</string>
 	<string name="flickr_post_success">Sie haben auf Flickr gepostet.</string>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
deleted file mode 100644
index 6c3214a76d..0000000000
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- legacy_header_height="18"
- height="340"
- layout="topleft"
- name="item properties"
- help_topic="item_properties"
- save_rect="true"
- title="INVENTORY ITEM PROPERTIES"
- width="350">
-    <floater.string
-     name="unknown">
-        (unknown)
-    </floater.string>
-    <floater.string
-     name="public">
-        (public)
-    </floater.string>
-    <floater.string
-     name="you_can">
-        You can:
-    </floater.string>
-    <floater.string
-     name="owner_can">
-        Owner can:
-    </floater.string>
-    <floater.string
-     name="acquiredDate">
-        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-    </floater.string>
-    <icon
-     follows="top|right"
-     height="18"
-     image_name="Lock"
-     layout="topleft"
-     left="276"
-     mouse_opaque="true"
-     name="IconLocked"
-     top="4"
-     width="18" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="LabelItemNameTitle"
-     top="25"
-     width="78">
-        Name:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     max_length_bytes="63"
-     name="LabelItemName"
-     top_delta="0"
-     width="252" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="LabelItemDescTitle"
-     top="45"
-     width="78">
-        Description:
-    </text>
-    <line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     max_length_bytes="127"
-     name="LabelItemDesc"
-     top_delta="0"
-     width="252" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelCreatorTitle"
-     top="65"
-     width="78">
-        Creator:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelCreatorName"
-     top_delta="0"
-     translate="false"
-     use_ellipses="true" 
-     width="170">
-        TestString PleaseIgnore
-    </text>
-    <button
-     follows="top|right"
-     height="16"
-     label="Profile..."
-     layout="topleft"
-     left_delta="174"
-     name="BtnCreator"
-     top_delta="0"
-     width="78" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelOwnerTitle"
-     top="85"
-     width="78">
-        Owner:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelOwnerName"
-     top_delta="0"
-     translate="false"
-     use_ellipses="true"
-     width="170">
-      TestString PleaseIgnore
-    </text>
-    <button
-     follows="top|right"
-     height="16"
-     label="Profile..."
-     layout="topleft"
-     left_delta="174"
-     name="BtnOwner"
-     top_delta="0"
-     width="78" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left="10"
-     name="LabelAcquiredTitle"
-     top="105"
-     width="78">
-        Acquired:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="78"
-     name="LabelAcquiredDate"
-     top_delta="0"
-     width="252">
-        Wed May 24 12:50:46 2006
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="OwnerLabel"
-     top="125"
-     width="78">
-        You:
-    </text>
-    <check_box
-     height="16"
-     label="Edit"
-     layout="topleft"
-     left_pad="5"
-     name="CheckOwnerModify"
-     top_delta="0"
-     width="78" />
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_delta="0"
-     name="CheckOwnerCopy"
-     top_pad="5"
-     width="88" />
-    <check_box
-     height="16"
-     label="Resell"
-     layout="topleft"
-     left_delta="0"
-     name="CheckOwnerTransfer"
-     top_pad="5"
-     width="106" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="AnyoneLabel"
-     top_pad="5"
-     width="78">
-        Anyone:
-    </text>
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_pad="5"
-     name="CheckEveryoneCopy"
-     top_delta="0"
-     width="130" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="GroupLabel"
-     top_pad="5"
-     width="78">
-        Group:
-    </text>
-    <check_box
-     height="16"
-     label="Share"
-     layout="topleft"
-     left_pad="5"
-     name="CheckShareWithGroup"
-     top_delta="5"
-     width="106" />
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="25"
-     layout="topleft"
-     left="10"
-     name="NextOwnerLabel"
-     top_pad="5"
-     width="78"
-     word_wrap="true">
-        Next owner:
-    </text>
-    <check_box
-     height="16"
-     label="Edit"
-     layout="topleft"
-     left_pad="5"
-     name="CheckNextOwnerModify"
-     top_delta="0"
-     width="78" />
-    <check_box
-     height="16"
-     label="Copy"
-     layout="topleft"
-     left_delta="0"
-     name="CheckNextOwnerCopy"
-     top_pad="5"
-     width="88" />
-    <check_box
-     height="16"
-     label="Resell"
-     layout="topleft"
-     left_delta="0"
-     name="CheckNextOwnerTransfer"
-     top_pad="5"
-     width="106" />
-    <check_box
-     height="16"
-     label="For Sale"
-     layout="topleft"
-     left="10"
-     name="CheckPurchase"
-     top_pad="5"
-     width="78" />
-     <combo_box
-     height="19"
-     left_pad="5"
-     layout="topleft"
-     follows="left|top"
-     name="ComboBoxSaleType"
-     width="110">
-       <combo_box.item
-         name="Copy"
-         label="Copy"
-         value="2" />
-       <combo_box.item
-         name="Contents"
-         label="Contents"
-         value="3" />
-       <combo_box.item
-         name="Original"
-         label="Original"
-         value="1" />
-    </combo_box>
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        name="Edit Cost"
-        label="Price:"
-        label_width="100"
-        left="10"
-        width="192"
-        min_val="1"
-        height="19"
-        max_val="999999999"
-        top_pad="5"/>
-    <text
-        type="string"
-        length="1"
-        height="15"
-        follows="left|top"
-        layout="topleft"
-        left_delta="82"
-        name="CurrencySymbol"
-        top_delta="1"
-        width="18">
-      L$
-    </text>
-
-    <!--line_editor
-     border_style="line"
-     border_thickness="1"
-     follows="left|top|right"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     max_length_bytes="25"
-     name="EditPrice"
-     top_delta="0"
-     width="242" /-->
-
-    <!--text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left="10"
-     name="BaseMaskDebug"
-     top="155"
-     width="330">
-        B:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="OwnerMaskDebug"
-     top_delta="0"
-     width="270">
-        O:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="GroupMaskDebug"
-     top_delta="0"
-     width="210">
-        G:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="EveryoneMaskDebug"
-     top_delta="0"
-     width="150">
-        E:
-    </text>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="60"
-     name="NextMaskDebug"
-     top_delta="0"
-     width="90">
-        N:
-    </text-->
-
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index 156bba6c27..08b7a7af05 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -4,8 +4,8 @@
  can_minimize="true"
  can_resize="false"
  save_rect="true"
- height="370"
- width="370"
+ height="483"
+ width="483"
  name="inventory_settings"
  title="INVENTORY SETTINGS">
  <icon
@@ -16,7 +16,7 @@
   left="18"
   mouse_opaque="true"
   name="multi_folder_icon"
-  top="25"
+  top="20"
   width="18" />
  <text
    type="string"
@@ -40,10 +40,10 @@
   font="SansSerifMedium"
   left="60"
   width="300"
-  height="70"
+  height="66"
   name="multi_double_click_setting">
      <radio_item
-      height="20"
+      height="18"
       label="Expands &amp; collapses folder"
       label_text.text_color="White"
       follows="left|top"
@@ -51,24 +51,24 @@
       name="0"
       width="200"/>
      <radio_item
-      height="20"
+      height="18"
       follows="left|top"
       label="Opens a new window"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="1"
-      top_pad ="5"
+      top_pad ="3"
       width="200" />
      <radio_item
-      height="20"
+      height="18"
       follows="left|top"
       label="Switches view"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="2"
-      top_pad ="5"
+      top_pad ="3"
       width="200" />
  </radio_group>
  <icon
@@ -79,7 +79,7 @@
   left="18"
   mouse_opaque="true"
   name="single_folder_icon"
-  top_pad="30"
+  top_pad="19"
   width="18" />
  <text
    type="string"
@@ -103,10 +103,10 @@
   font="SansSerifMedium"
   left="60"
   width="300"
-  height="45"
+  height="44"
   name="single_double_click_setting">
      <radio_item
-      height="20"
+      height="18"
       label="Stays in current window"
       label_text.text_color="White"
       follows="left|top"
@@ -114,27 +114,37 @@
       name="false"
       width="200"/>
      <radio_item
-      height="20"
+      height="18"
       follows="left|top"
       label="Opens a new window"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="true"
-      top_pad ="5"
+      top_pad ="3"
       width="200" />
  </radio_group>
+  <icon
+   follows="top|left"
+   height="15"
+   image_name="Icon_Pointer"
+   layout="topleft"
+   left="20"
+   mouse_opaque="true"
+   name="single_folder_icon"
+   top_pad="20"
+   width="15" />
  <text
    type="string"
    length="1"
    follows="left|top|right"
    height="13"
    layout="topleft"
-   left="48"
+   left_pad="13"
    name="find_original_txt"
    font="SansSerifMedium"
    text_color="White"
-   top_pad="30"
+   top_delta="1"
    width="300">
    Clicking on "Show in inventory" or "Find original"
  </text>
@@ -146,10 +156,10 @@
   font="SansSerifMedium"
   left="60"
   width="300"
-  height="45"
+  height="44"
   name="find_original_settings">
      <radio_item
-      height="20"
+      height="18"
       label="Shows item in main inventory window"
       label_text.text_color="White"
       follows="left|top"
@@ -157,23 +167,136 @@
       name="false"
       width="200"/>
      <radio_item
-      height="20"
+      height="18"
       follows="left|top"
       label="Opens a new single-folder window"
       label_text.text_color="White"
       layout="topleft"
       left_delta="0"
       name="true"
-      top_pad ="5"
+      top_pad ="3"
       width="200" />
  </radio_group>
- <button
-  height="20"
-  label="OK"
-  layout="topleft"
-  left="140"
-  bottom="-20"
-  name="ok_btn"
-  label_color="White"
-  width="90" />
+  <icon
+   follows="top|left"
+   height="18"
+   image_name="Inv_Favorite_Star_Full"
+   layout="topleft"
+   left="18"
+   mouse_opaque="true"
+   name="favorites_icon"
+   top_pad="19"
+   width="18" />
+  <text
+   type="string"
+   length="1"
+   layout="topleft"
+   follows="left|top|right"
+   height="13"
+   left_pad="12"
+   top_delta="2"
+   name="favorites_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Favorites
+  </text>
+  <check_box
+   control_name="InventoryFavoritesUseStar"
+   layout="topleft"
+   follows="left|top"
+   top_pad="8"
+   font="SansSerifMedium"
+   left="60"
+   width="300"
+   height="18"
+   label="Star on favorite items"
+   name="favorite_star"
+   label_text.text_color="White"
+   initial_value="false"/>
+  <check_box
+   control_name="InventoryFavoritesUseHollowStar"
+   follows="left|top"
+   top_pad="5"
+   layout="topleft"
+   font="SansSerifMedium"
+   left="60"
+   width="150"
+   height="18"
+   label="Star on folders containing a favorite"
+   name="favorite_hollow_star"
+   label_text.text_color="White"
+   initial_value="false"/>
+  <check_box
+   control_name="InventoryFavoritesColorText"
+   follows="left|top"
+   top_pad="5"
+   layout="topleft"
+   font="SansSerifMedium"
+   left="60"
+   width="150"
+   height="18"
+   label="Colored text"
+   name="favorites_color"
+   label_text.text_color="White"
+   initial_value="false"/>
+  <color_swatch
+   can_apply_immediately="true"
+   follows="left|top"
+   layout="topleft"
+   height="24"
+   label_height="0"
+   left_pad="40"
+   name="favorites_swatch"
+   top_delta="-6"
+   width="44" >
+    <color_swatch.init_callback
+     function="ScriptPref.getUIColor"
+     parameter="InventoryFavoriteColor" />
+    <color_swatch.commit_callback
+     function="ScriptPref.applyUIColor"
+     parameter="InventoryFavoriteColor" />
+  </color_swatch>
+  <icon
+   follows="top|left"
+   height="18"
+   image_name="Inv_Object"
+   layout="topleft"
+   left="18"
+   mouse_opaque="true"
+   name="obj_icon"
+   top_pad="19"
+   width="18" />
+  <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="single_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Pressing return on an avatar attachment
+  </text>
+  <combo_box
+   control_name="InventoryAddAttachmentBehavior"
+   layout="topleft"
+   follows="left|top"
+   top_pad="8"
+   height="24"
+   left="60"
+   name="attach_combo"
+   width="300">
+    <combo_box.item
+      label="Adds attachment (recommended)"
+      name="0"
+      value="0"/>
+    <combo_box.item
+      label="Wear (removes attachment at that point)"
+      name="1"
+      value="1"/>
+  </combo_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index a9900f05b7..881c1f7469 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -12,7 +12,7 @@
  save_visibility="true"
  reuse_instance="true"
  title="INVENTORY"
- width="363" >
+ width="418" >
    <panel
     class="sidepanel_inventory"
     name="main_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
index 57b74b360a..9981e5d893 100644
--- a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -17,17 +17,7 @@
 New inventory features
     </floater.string>
     <floater.string name="description_txt_inventory">
-You can now add preview images to inventory items and view a folder in its own window.
-Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
-    </floater.string>
-    <floater.string name="title_txt_gltf">
-New GLTF PBR materials support
-    </floater.string>
-    <floater.string name="description_txt_gltf">
-You can now use expanded material support with the ability to import and edit GLTF Physically Based Rendering (PBR) Materials.
-In order to support the addition of the GLTF format, some areas in the viewer may appear darker than usual.
-
-Learn more about [https://wiki.secondlife.com/wiki/PBR_Materials Physically Based Rendering (PBR)]
+You can now mark items and folders as favorites. Favorited items will appear in the Favorites tab of inventory and by default will be highlighted with a star in the main inventory view.
     </floater.string>
   <text
    type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
index 5e4b017590..709fbdd27e 100644
--- a/indra/newview/skins/default/xui/en/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
@@ -2,7 +2,7 @@
 <floater
  can_close="true"
  can_tear_off="false"
- height="289"
+ height="372"
  help_topic="object_weights"
  layout="topleft"
  name="object_weights"
@@ -13,6 +13,21 @@
     <floater.string
      name="nothing_selected"
      value="--"/>
+    <floater.string
+     name="lowest_lod"
+     value="Lowest"/>
+    <floater.string
+     name="low_lod"
+     value="Low"/>
+    <floater.string
+     name="medium_lod"
+     value="Medium"/>
+    <floater.string
+     name="high_lod"
+     value="High"/>
+    <floater.string
+     name="multiple_lods"
+     value="Multiple"/>
 
     <text
      follows="left|top"
@@ -320,4 +335,97 @@
      top_delta="0"
      value="Total capacity"
      width="130" />
+
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="rendering_info_text"
+     text_color="EmphasisColor"
+     top_pad="10"
+     value="RENDERING INFO"
+     width="180" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="lod_level"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="lod_level_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="lod_level_label"
+     top_delta="0"
+     value="LOD (Level of detail)"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="triangles_shown"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="triangles_shown_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="triangles_shown_label"
+     top_delta="0"
+     value="Triangles Shown"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="pixel_area"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="pixel_area_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="pixel_area_label"
+     top_delta="0"
+     value="Pixel Area"
+     width="130" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 88d6ae1bc2..9b637d60f2 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -1011,7 +1011,7 @@
     layout="topleft"
     left="420"
     name="Mirrors"
-    top_delta="24"
+    top_delta="22"
     width="240">
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
@@ -1113,7 +1113,7 @@
     max_val="1.0"
     name="RenderSharpness"
     show_text="true"
-    top_delta="24"
+    top_delta="20"
     width="260">
   </slider>
   <!-- End of Sharpening Settings-->
@@ -1164,7 +1164,7 @@
    max_val="1.0"
    name="TonemapMix"
    show_text="true"
-   top_delta="22"
+   top_delta="20"
    width="260">
   </slider>
   <!-- End of Tone Mapping Settings-->
diff --git a/indra/newview/skins/default/xui/en/floater_preview_trash.xml b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
index f1c87c8c5a..ebb5cd9251 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_trash.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_trash.xml
@@ -29,6 +29,8 @@
       bevel_style="none"
       scroll.reserve_scroll_corner="false">
     <folder folder_arrow_image="Folder_Arrow"
+            favorite_image="Inv_Favorite_Star_Full"
+            favorite_content_image="Inv_Favorite_Star_Content"
             folder_indentation="8"
             item_height="20"
             item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
index 51809793d3..c0d260ef59 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
@@ -22,7 +22,7 @@
 		increment="0.025"
 		initial_value="0.5"
 		label="Voice Chat"
-		label_width="50"
+		label_width="60"
 		layout="topleft"
 		left="15"
 		top="50"
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index 99f84fe808..d8ef139d37 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -670,6 +670,22 @@
      function="Inventory.DoToSelected"
      parameter="ungroup_folder_items" />
   </menu_item_call>
+  <menu_item_call
+   label="Add to Favorites"
+   layout="topleft"
+   name="Add to Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="add_to_favorites" />
+  </menu_item_call>
+  <menu_item_call
+   label="Remove from Favorites"
+   layout="topleft"
+   name="Remove from Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="remove_from_favorites" />
+  </menu_item_call>
   <menu
    label="Use as default for"
    layout="topleft"
@@ -725,6 +741,136 @@
     <menu_item_call.on_visible
      function="Inventory.CanSetFavoriteFolder" />
   </menu_item_call>
+  <menu
+   label="Upload to folder"
+   layout="topleft"
+   name="upload_options">
+    <menu_item_call
+     label="Image..."
+     layout="topleft"
+     name="Upload Image">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_texture" />
+       <menu_item_call.on_enable
+        function="File.EnableUpload" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Upload Image,texture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound (L$[COST])..."
+     layout="topleft"
+     name="Upload Sound">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_sound" />
+       <menu_item_call.on_enable
+        function="File.EnableUpload" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Upload Sound,sound" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation (L$[COST])..."
+     layout="topleft"
+     name="Upload Animation">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_animation" />
+       <menu_item_call.on_enable
+        function="File.EnableUpload" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Upload Animation,animation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model..."
+     layout="topleft"
+     name="Upload Model">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_model" />
+       <menu_item_call.on_enable
+        function="File.EnableUploadModel" />
+       <menu_item_call.on_visible
+        function="File.VisibleUploadModel"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Material..."
+     layout="topleft"
+     name="Upload Material">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_pbr_material" />
+       <menu_item_call.on_enable
+        function="File.EnableUploadMaterial" />
+    </menu_item_call>
+    <menu_item_call
+     label="Bulk..."
+     layout="topleft"
+     name="Bulk Upload">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_bulk" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Bulk Upload,texture" />
+    </menu_item_call>
+  </menu>
+  <menu
+   label="Use as default for"
+   layout="topleft"
+   name="upload_def">
+    <menu_item_call
+     label="Image uploads"
+     layout="topleft"
+     name="Image uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+        parameter="def_texture" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound uploads"
+     layout="topleft"
+     name="Sound uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_sound" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation uploads"
+     layout="topleft"
+     name="Animation uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_animation" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model uploads"
+     layout="topleft"
+     name="Model uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_model" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+    <menu_item_call
+     label="PBR material uploads"
+     layout="topleft"
+     name="PBR uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_pbr_material" />
+    </menu_item_call>
+  </menu>
 	<menu_item_separator
 	 layout="topleft"
 	 name="Marketplace Separator" />
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 99cee83f4e..fb68193006 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -50,6 +50,26 @@
         function="Outfit.Thumbnail" />
     </menu_item_call>
     <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+      <on_visible
+       function="Outfit.OnVisible"
+       parameter="favorites_add" />
+      <on_click
+       function="Outfit.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+      <on_visible
+       function="Outfit.OnVisible"
+       parameter="favorites_remove" />
+      <on_click
+       function="Outfit.Favorite" />
+  </menu_item_call>
+    <menu_item_call
         label="Edit outfit"
         layout="topleft"
         name="edit">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index e0f380e074..fdeefe9089 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -942,7 +942,7 @@
          function="Inventory.EnvironmentEnabled" />
       </menu_item_call>
     </menu>
-  </menu>  
+  </menu>
   <menu_item_call
    label="Create folder from selected"
    layout="topleft"
@@ -959,6 +959,99 @@
      function="Inventory.DoToSelected"
      parameter="ungroup_folder_items" />
   </menu_item_call>
+  <menu_item_call
+   label="Add to Favorites"
+   layout="topleft"
+   name="Add to Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="add_to_favorites" />
+  </menu_item_call>
+  <menu_item_call
+   label="Remove from Favorites"
+   layout="topleft"
+   name="Remove from Favorites">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="remove_from_favorites" />
+  </menu_item_call>
+  <menu
+   label="Upload to folder"
+   layout="topleft"
+   name="upload_options">
+    <menu_item_call
+     label="Image..."
+     layout="topleft"
+     name="Upload Image">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_texture" />
+       <menu_item_call.on_enable
+        function="File.EnableUpload" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Upload Image,texture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound (L$[COST])..."
+     layout="topleft"
+     name="Upload Sound">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_sound" />
+       <menu_item_call.on_enable
+        function="File.EnableUpload" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Upload Sound,sound" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation (L$[COST])..."
+     layout="topleft"
+     name="Upload Animation">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_animation" />
+       <menu_item_call.on_enable
+        function="File.EnableUpload" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Upload Animation,animation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model..."
+     layout="topleft"
+     name="Upload Model">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_model" />
+       <menu_item_call.on_enable
+        function="File.EnableUploadModel" />
+       <menu_item_call.on_visible
+        function="File.VisibleUploadModel"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Material..."
+     layout="topleft"
+     name="Upload Material">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_pbr_material" />
+       <menu_item_call.on_enable
+        function="File.EnableUploadMaterial" />
+    </menu_item_call>
+    <menu_item_call
+     label="Bulk..."
+     layout="topleft"
+     name="Bulk Upload">
+       <menu_item_call.on_click
+        function="Inventory.FileUploadLocation"
+        parameter="upload_bulk" />
+       <menu_item_call.on_visible
+        function="Upload.CalculateCosts"
+        parameter="Bulk Upload,texture" />
+    </menu_item_call>
+  </menu>
   <menu
    label="Use as default for"
    layout="topleft"
@@ -969,39 +1062,39 @@
      name="Image uploads">
       <menu_item_call.on_click
        function="Inventory.FileUploadLocation"
-        parameter="texture" />
+       parameter="def_texture" />
     </menu_item_call>
     <menu_item_call
      label="Sound uploads"
      layout="topleft"
      name="Sound uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="sound" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_sound" />
     </menu_item_call>
     <menu_item_call
      label="Animation uploads"
      layout="topleft"
      name="Animation uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="animation" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_animation" />
     </menu_item_call>
     <menu_item_call
      label="Model uploads"
      layout="topleft"
      name="Model uploads">
-    <menu_item_call.on_click
-     function="Inventory.FileUploadLocation"
-     parameter="model" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_model" />
     </menu_item_call>
     <menu_item_call
      label="PBR material uploads"
      layout="topleft"
      name="PBR uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="pbr_material" />
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="def_pbr_material" />
     </menu_item_call>
   </menu>
   <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index e249acaccd..d17fbf84b3 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -138,4 +138,15 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_call>
+    <menu_item_separator/>
+    <menu_item_check
+     label="Inventory settings..."
+     name="inv_settings">
+      <menu_item_check.on_check
+       function="Floater.Visible"
+       parameter="inventory_settings" />
+      <menu_item_check.on_click
+       function="Floater.Toggle"
+       parameter="inventory_settings" />
+    </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 33cf01493d..97f53d3a17 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -100,15 +100,4 @@
          function="Inventory.GearDefault.Visible"
          parameter="single_folder_view" />
     </menu_item_check>
-    <menu_item_separator/>
-    <menu_item_check
-     label="Inventory settings..."
-     name="inv_settings">
-        <menu_item_check.on_check
-         function="Floater.Visible"
-         parameter="inventory_settings" />
-        <menu_item_check.on_click
-         function="Floater.Toggle"
-         parameter="inventory_settings" />
-    </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
new file mode 100644
index 0000000000..aa4cd1483d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gallery_sort.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ layout="topleft"
+ visible="false"
+ name="Sort Outfit">  
+  <menu_item_check
+   label="Sort favorites to top"
+   layout="topleft"
+   visible="true"
+   name="sort_favorites_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="favorites_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="favorites_to_top" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort images to top"
+   layout="topleft"
+   visible="true"
+   name="sort_images_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="images_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="images_to_top" />
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by name"
+   layout="topleft"
+   visible="true"
+   name="sort_by_name">
+    <on_click
+     function="Sort.OnSort"
+    parameter="by_name" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="by_name" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index 8f36c7a00a..e333b05d3e 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -50,6 +50,26 @@
         function="Gear.Thumbnail" />
     </menu_item_call>
     <menu_item_call
+     label="Add to favorite outfits"
+     layout="topleft"
+     name="favorites_add">
+       <on_visible
+        function="Gear.OnVisible"
+        parameter="favorites_add" />
+       <on_click
+        function="Gear.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorite outfits"
+     layout="topleft"
+     name="favorites_remove">
+       <on_visible
+        function="Gear.OnVisible"
+        parameter="favorites_remove" />
+       <on_click
+        function="Gear.Favorite" />
+    </menu_item_call>
+    <menu_item_call
      label="Rename outfit"
      layout="topleft"
      name="rename">
@@ -89,34 +109,6 @@
          function="Gear.OnVisible"
          parameter="delete" />
     </menu_item_call>
-    <menu_item_separator>
-        <on_visible
-         function="Gear.OnVisible"/>
-    </menu_item_separator>
-    <menu_item_check
-     label="Sort folders always by name"
-     layout="topleft"
-     name="sort_folders_by_name">
-        <on_click
-         function="Gear.SortByName" />
-        <on_check
-         function="CheckControl"
-         parameter="OutfitGallerySortByName" />
-    </menu_item_check>
-        <menu_item_call
-     label="Expand all folders"
-     layout="topleft"
-     name="expand">
-        <on_click
-         function="Gear.Expand" />
-    </menu_item_call>
-    <menu_item_call
-     label="Collapse all folders"
-     layout="topleft"
-     name="collapse">
-        <on_click
-         function="Gear.Collapse" />
-    </menu_item_call>
   <menu_item_separator/>
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
             <!--  *TODO: generate dynamically? -->
@@ -277,4 +269,19 @@
                 </menu_item_call>
             </menu>
             <!-- copied from menu_inventory_add.xml -->
+
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Inventory settings..."
+   layout="topleft"
+   visible="true"
+   name="inventory_settings">
+    <menu_item_check.on_check
+     function="Floater.Visible"
+     parameter="inventory_settings" />
+    <menu_item_check.on_click
+     function="Floater.Toggle"
+     parameter="inventory_settings" />
+  </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml b/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
new file mode 100644
index 0000000000..0a4d1ea877
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_outfit_list_sort.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu
+ layout="topleft"
+ visible="false"
+ name="Sort Outfit">
+    <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Sort.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     visible="true"
+     name="collapse">
+        <on_click
+         function="Sort.Collapse" />
+    </menu_item_call>
+  
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Sort favorites to top"
+   layout="topleft"
+   name="sort_favorites_to_top">
+    <on_click
+     function="Sort.OnSort"
+    parameter="favorites_to_top" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="favorites_to_top" />
+  </menu_item_check>
+
+  <menu_item_separator/>
+
+  <menu_item_check
+   label="Show entire outfit in search"
+   layout="topleft"
+   name="show_entire_outfit_in_search">
+    <on_click
+     function="Sort.OnSort"
+    parameter="show_entire_outfit" />
+    <on_check
+     function="Sort.OnEnable"
+     parameter="show_entire_outfit" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index c6805edd63..0d45e7c95c 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
@@ -50,6 +50,26 @@
         function="Outfit.Thumbnail" />
     </menu_item_call>
     <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+       <on_visible
+        function="Outfit.OnVisible"
+        parameter="favorites_add" />
+       <on_click
+        function="Outfit.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+       <on_visible
+        function="Outfit.OnVisible"
+        parameter="favorites_remove" />
+       <on_click
+        function="Outfit.Favorite" />
+    </menu_item_call>
+    <menu_item_call
         label="Edit outfit"
         layout="topleft"
         name="edit">
diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
index 57f4aa8655..96cbac4478 100644
--- a/indra/newview/skins/default/xui/en/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
@@ -24,6 +24,9 @@
         <menu_item_call.on_click 
                 function="MyEnvironments.DoApply"
                 parameter="local" />
+      <menu_item_call.on_enable
+              function="MyEnvironments.CanApply"
+              parameter="local"/>
     </menu_item_call>
     <menu_item_call
             name="Settings Apply Parcel"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3de2473927..9bc65ac794 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1586,6 +1586,64 @@ function="World.EnvPreset"
              parameter="RenderDisablePostProcessing" />
           </menu_item_check>
           
+
+          <menu
+           create_jump_keys="true"
+           label="Selection level of detail"
+           name="Selection level of detail"
+           tear_off="true">
+
+              <menu_item_check
+                label="Default"
+                name="Default lod setting">
+                  <menu_item_check.on_check
+                   function="Tools.ToolsCheckSelectionLODMode"
+                   parameter="default" />
+                  <menu_item_check.on_click
+                   function="Tools.SelectionLODMode"
+                   parameter="default" />
+              </menu_item_check>
+              <menu_item_check
+                label="High"
+                name="High lod setting">
+                  <menu_item_check.on_check
+                   function="Tools.ToolsCheckSelectionLODMode"
+                   parameter="high" />
+                  <menu_item_check.on_click
+                   function="Tools.SelectionLODMode"
+                   parameter="high" />
+              </menu_item_check>
+              <menu_item_check
+                label="Medium"
+                name="Medium lod setting">
+                  <menu_item_check.on_check
+                   function="Tools.ToolsCheckSelectionLODMode"
+                   parameter="medium" />
+                  <menu_item_check.on_click
+                   function="Tools.SelectionLODMode"
+                   parameter="medium" />
+              </menu_item_check>
+              <menu_item_check
+                label="Low"
+                name="Low lod setting">
+                  <menu_item_check.on_check
+                   function="Tools.ToolsCheckSelectionLODMode"
+                   parameter="low" />
+                  <menu_item_check.on_click
+                   function="Tools.SelectionLODMode"
+                   parameter="low" />
+              </menu_item_check>
+              <menu_item_check
+                label="Lowest"
+                name="Lowest lod setting">
+                  <menu_item_check.on_check
+                   function="Tools.ToolsCheckSelectionLODMode"
+                   parameter="lowest" />
+                  <menu_item_check.on_click
+                   function="Tools.SelectionLODMode"
+                   parameter="lowest" />
+              </menu_item_check>
+          </menu>
         <menu_item_separator/>
 
                 <menu_item_check
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index ee77ef23f0..63d37edf38 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -80,6 +80,20 @@
          function="Attachment.Profile" />
     </menu_item_call>
     <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+       <on_click
+        function="Attachment.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+       <on_click
+        function="Attachment.Favorite" />
+    </menu_item_call>
+    <menu_item_call
      label="Show Original"
      layout="topleft"
      visible="false"
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
index 321e8a0831..9a752a1643 100644
--- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
@@ -31,6 +31,20 @@
          function="Wearing.Detach"
          parameter="detach"/>
     </menu_item_call>
+    <menu_item_call
+     label="Add to favorites"
+     layout="topleft"
+     name="favorites_add">
+       <on_click
+        function="Wearing.Favorite" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove from favorites"
+     layout="topleft"
+     name="favorites_remove">
+       <on_click
+        function="Wearing.Favorite" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft"
      name="edit_outfit_separator" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 4245b22e88..89511c2fa2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3139,9 +3139,13 @@ Would you be my friend?
       <input name="listname" type="text"/>
       <button
        default="true"
-       index="0"
+       index="1"
        name="SetName"
        text="OK"/>
+      <button
+       index="0"
+       name="Cancel"
+       text="Cancel"/>
     </form>
   </notification>
 
@@ -3170,6 +3174,29 @@ Would you be my friend?
 
   <notification
    icon="alertmodal.tga"
+   label="Rename Auto-Replace List"
+   name="RemoveAutoReplaceList"
+   type="alertmodal">
+'[LIST_NAME]' contains [MAP_SIZE] entries.
+    
+Are you sure you want to delete this list?
+      <tag>confirm</tag>
+    <form name="form">
+      <button
+       default="true"
+       index="1"
+       name="DeleteList"
+       text="Delete"/>
+      <button
+       default="false"
+       index="0"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+    <notification
+   icon="alertmodal.tga"
    name="InvalidAutoReplaceEntry"
    type="alertmodal">
     The keyword must be a single word, and the replacement may not be empty.
@@ -4628,13 +4655,12 @@ You already have blocked this name.
 
   <notification
    icon="alert.tga"
-   name="RemoveItemWarn"
+   name="CantModifyContentInNoModTask"
    type="alert">
-Though permitted, deleting contents may damage the object. Do you want to delete that item?
+You don't have permission to modify content of this object
     <tag>confirm</tag>
     <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
+     name="okbutton"
      yestext="OK"/>
   </notification>
 
@@ -10336,6 +10362,14 @@ You are now the owner of object [OBJECT_NAME]
 
   <notification
    icon="alertmodal.tga"
+   name="NowOwnObjectInv"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME] and it has been placed in your inventory.
+  </notification>
+
+    <notification
+   icon="alertmodal.tga"
    name="CantRezOnLand"
    type="notify">
    <tag>fail</tag>
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 73cb9b080f..f5906c17fd 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -43,6 +43,16 @@
     follows="left|top"
     visible="false"
     image_name="Inv_Link"/>
+  <icon
+   layout="topleft"
+   follows="left|top"
+   name="fav_icon"
+   left="110"
+   top_pad="-14"
+   height="14"
+   width="14"
+   visible="true"
+   image_name="Inv_Favorite_Star_Full"/>
   <panel
    background_visible="false"
    background_opaque="true"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 498dab1ef3..6e1e6facbe 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -269,6 +269,22 @@
          scroll.reserve_scroll_corner="false">
             <folder double_click_override="true"/>
         </inventory_panel>
+        <favorites_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         label="FAVORITES"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         name="Favorites"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         scroll.reserve_scroll_corner="false">
+          <folder double_click_override="true"/>
+        </favorites_inventory_panel>
       </tab_container>
     </panel>
     <panel
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
index a8a306bea9..9586957694 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
@@ -21,5 +21,5 @@
     border="false"
     bevel_style="none"
     show_item_link_overlays="true">
-    <item allow_wear="false"/>
+    <item marketplace_item="true"/> 
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
index 0c665fb07e..5f64a5d47a 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
@@ -20,5 +20,5 @@
     border="false"
     bevel_style="none"
     show_item_link_overlays="true">
-    <item allow_wear="false"/>
+    <item marketplace_item="true"/>
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
index 0be405c5b8..ab4d836ba9 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
@@ -19,5 +19,5 @@
     border="false"
     bevel_style="none"
     show_item_link_overlays="true">
-    <item allow_wear="false"/>
+    <item marketplace_item="true"/>
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
index 58122db7f4..303601e65b 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
@@ -20,5 +20,5 @@
     border="false"
     bevel_style="none"
     show_item_link_overlays="true">
-    <item allow_wear="false"/>
+    <item marketplace_item="true"/>
 </inventory_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index 6166268206..d49bf19c5d 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -35,7 +35,7 @@
   </text> 
   <scroll_container
    follows="all"
-   height="400"
+   height="429"
    width="312"
    layout="topleft"
    left="4"
@@ -44,49 +44,5 @@
    name="gallery_scroll_panel"
    opaque="false"
    top_pad="0">
-  </scroll_container> 
-  <panel
-     background_visible="false"
-	 follows="bottom|left|right"
-	 height="28"
-	 layout="topleft"
-	 left="4"
-	 top_pad="0"
-	 visible="true"
-	 name="bottom_panel"
-	 width="312">
-     <menu_button
-       follows="bottom|left"
-       tool_tip="Show additional options"
-       height="25"
-       image_hover_unselected="Toolbar_Left_Over"
-       image_overlay="OptionsMenu_Off"
-       image_selected="Toolbar_Left_Selected"
-       image_unselected="Toolbar_Left_Off"
-       layout="topleft"
-       left="0"
-       name="options_gear_btn"
-       top="1"
-       width="31" />
-     <icon
-       follows="bottom|left|right"
-       height="25"
-       image_name="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="dummy_icon"
-       width="243"/>
-      <button
-       follows="bottom|right"
-       height="25"
-       image_hover_unselected="Toolbar_Right_Over"
-       image_overlay="TrashItem_Off"
-       image_selected="Toolbar_Right_Selected"
-       image_unselected="Toolbar_Right_Off"
-       layout="topleft"
-       left_pad="1"
-       name="trash_btn"
-       tool_tip="Delete selected outfit"
-       width="31"/>
-    </panel>
+  </scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index e8d8e8f3e2..cd4e5ef1f6 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -16,7 +16,7 @@
      bg_opaque_color="DkGray2"
 
      follows="all"
-     height="400"
+     height="428"
      layout="topleft"
      left="3"
      name="outfits_accordion"
@@ -30,48 +30,4 @@
          name="no_outfits_msg"
          value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"/>
     </accordion>
-    <panel
-     background_visible="false"
-	 follows="bottom|left|right"
-	 height="28"
-	 layout="topleft"
-	 left="4"
-	 top_pad="0"
-	 visible="true"
-	 name="bottom_panel"
-	 width="312">
-     <menu_button
-       follows="bottom|left"
-       tool_tip="Show additional options"
-       height="25"
-       image_hover_unselected="Toolbar_Left_Over"
-       image_overlay="OptionsMenu_Off"
-       image_selected="Toolbar_Left_Selected"
-       image_unselected="Toolbar_Left_Off"
-       layout="topleft"
-       left="0"
-       name="options_gear_btn"
-       top="1"
-       width="31" />
-     <icon
-       follows="bottom|left|right"
-       height="25"
-       image_name="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="dummy_icon"
-       width="243"/>
-      <button
-       follows="bottom|right"
-       height="25"
-       image_hover_unselected="Toolbar_Right_Over"
-       image_overlay="TrashItem_Off"
-       image_selected="Toolbar_Right_Selected"
-       image_unselected="Toolbar_Right_Off"
-       layout="topleft"
-       left_pad="1"
-       name="trash_btn"
-       tool_tip="Delete selected outfit"
-       width="31"/>
-    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
index 559917ec0a..10073f0461 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -16,7 +16,7 @@
      <accordion
      fit_parent="true"
      follows="all"
-     height="400"
+     height="429"
      layout="topleft"
      left="3"
      single_expansion="true"
@@ -62,35 +62,4 @@
   </scroll_list>
      </accordion_tab>
      </accordion>
-    <panel
-     background_visible="false"
-     follows="bottom|left|right"
-     height="28"
-     layout="topleft"
-     left="4"
-     name="bottom_panel"
-     top_pad="0"
-     width="312">
-        <menu_button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Left_Over"
-         image_overlay="OptionsMenu_Off"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         layout="topleft"
-         left="0"
-         name="options_gear_btn"
-         tool_tip="Show additional options"
-         top="1"
-         width="31" />
-        <icon
-         follows="bottom|left|right"
-         height="25"
-         image_name="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="dummy_icon"
-         width="274" />
-    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 4d9a03823e..1005810145 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -19,7 +19,7 @@ background_visible="false"
    value="VISITED" />
   <string
    name="favorites_tab_title"
-   value="FAVORITES" />
+   value="FAVORITES BAR" />
   <string
    name="tooltip_trash_items"
    value="Remove selected landmark or folder" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index fa692d7200..9fba02d14e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -347,6 +347,41 @@
        0
   </text>
 
+  <slider
+    control_name="IndirectMaxNonImpostors"
+    name="IndirectMaxNonImpostors"
+    decimal_digits="0"
+    increment="1"
+    initial_value="12"
+    show_text="false"
+    min_val="1"
+    max_val="66"
+    label="Maximum number of animated avatars:"
+    follows="left|top"
+    layout="topleft"
+    height="16"
+    label_width="240"
+    left="30"
+    top_delta="20"
+    width="393">
+      <slider.commit_callback
+        function="Pref.UpdateIndirectMaxNonImpostors"
+        parameter="IndirectNonImpostorsText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="397"
+    text_readonly_color="LabelDisabledColor"
+    name="IndirectMaxNonImpostorsText"
+    width="65">
+      0
+  </text> 
+    
   <button
     height="23"
     label="Exceptions..."
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8202bb9de3..395efe3169 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -113,7 +113,7 @@
    control_name="ArrowKeysAlwaysMove"
    follows="left|top"
    height="20"
-   label="Arrow keys always move me"
+   label="Arrow keys always move me while in chat"
    layout="topleft"
    left_delta="5"
    name="arrow_keys_move_avatar_check"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 7687f7cd96..23bbf45e88 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -139,7 +139,7 @@
                     max_val_x="30"
                     min_val_y="-30"
                     max_val_y="30" 
-                    logarithmic="1"/>
+                    logarithmic="true"/>
 
             <text
                     name="cloud_image_label"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index bd68434aab..34b48574d5 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -248,29 +248,13 @@
                     
         </layout_panel>
         <layout_panel
-                name="moon_layout"
-                border="false"
+                border="true"
                 bevel_style="in"
+                name="moon_layout"
                 auto_resize="true"
                 user_resize="false"
                 visible="true"
                 height="400">
-            <layout_stack 
-                    name="moon_stack"
-                    left="5"
-                    top="5"
-                    right="-5"
-                    bottom="-5"
-                    follows="left|top|right|bottom"
-                    orientation="vertical">
-                <layout_panel
-                        border="true"
-                        bevel_style="in"
-                        auto_resize="true"
-                        user_resize="false"
-                        visible="true"
-                        name="moon_layout"
-                        height="220">
                     <text
                             name="moon_label"
                             follows="left|top"
@@ -423,9 +407,7 @@
                         name="moonbeacon" 
                         top_pad="5"
                         left_delta="-8"/>
-                            
-                </layout_panel>
-            </layout_stack>
+
         </layout_panel>
     </layout_stack>
 </panel>                
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 5e65b0e8a2..36ec0cb3ea 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -247,7 +247,7 @@
                         Reflection Wavelet Scale
                     </text>
                     <slider
-                            decimal_digits="1"
+                            decimal_digits="2"
                             follows="left|top"
                             increment="0.01"
                             height="16"
@@ -261,7 +261,7 @@
                             width="150"
                             can_edit_text="true"/>
                     <slider
-                            decimal_digits="1"
+                            decimal_digits="2"
                             follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
@@ -274,7 +274,7 @@
                             width="150"
                             can_edit_text="true"/>
                     <slider
-                            decimal_digits="1"
+                            decimal_digits="2"
                             follows="left|top"
                             increment="0.01"
                             initial_value="0.7"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index f8040b9a65..0cac1b410f 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -60,7 +60,7 @@
          name="Large(512x512)"
          value="[i512,i512]" />
         <combo_box.item
-         label="Current Window(512x512)"
+         label="Current Window"
          name="CurrentWindow"
          value="[i0,i0]" />
         <combo_box.item
@@ -119,6 +119,8 @@
      type="string"
      word_wrap="true">
         To save your image as a texture select one of the square formats.
+
+Upload cost: L$[UPLOAD_COST]
     </text>
     <button
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 3a7731d235..2fb02af61c 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -31,7 +31,7 @@
    image_overlay_alignment="left"
    image_top_pad="-1"
    imgoverlay_label_space="10"
-   label="Save to Inventory (L$[AMOUNT])"
+   label="Save to Inventory"
    layout="topleft"
    left_delta="0"
    name="save_to_inventory_btn"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index c03fac4aad..3e9efb6f8b 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -64,7 +64,7 @@ width="333">
       font="SansSerifSmall"
       text_color="EmphasisColor"
       width="300"
-      height="10"
+      height="13"
       follows="top|left|right"
       layout="topleft"
       left="35"
@@ -94,7 +94,7 @@ width="333">
       image_overlay="Edit_Wrench"
       label=""
       layout="topleft"
-      left="265"
+      right="-3"
       name="edit_outfit_btn"
       tool_tip="Edit this outfit"
       top="3"
@@ -108,17 +108,100 @@ width="333">
       top="6"
       width="24" />
    </panel>
-   <filter_editor
-   height="23"
-   follows="left|top|right"
-   layout="topleft"
-   left="10"
-   label="Filter Outfits"
-   max_length_chars="300"
-   name="Filter"
-   search_button_visible="true"
-   top_pad="10"
-   width="307" />
+   <layout_stack
+    animate="false"
+    border_size="0"
+    follows="left|top|right"
+    height="27"
+    layout="topleft"
+    orientation="horizontal"
+    top_pad="6"
+    left="0"
+    name="top_menu_panel"
+    width="320">
+    <layout_panel
+      auto_resize="true"
+      layout="topleft"
+      name="filter_panel"
+      width="193">
+      <filter_editor
+        text_pad_left="10"
+        follows="left|top|right"
+        font="SansSerifSmall"
+        height="23"
+        layout="topleft"
+        left="10"
+        label="Filter Outfits"
+        max_length_chars="300"
+        name="Filter"
+        search_button_visible="true"
+        tab_group="1"
+        top="3"
+        width="181" />
+    </layout_panel>
+    <layout_panel
+      auto_resize="false"
+      height="25"
+      layout="topleft"
+      name="options_gear_btn_panel"
+      width="32">
+      <menu_button
+        follows="bottom|left"
+        tool_tip="Show additional options"
+        height="25"
+        image_hover_unselected="Toolbar_Middle_Over"
+        image_overlay="OptionsMenu_Off"
+        image_selected="Toolbar_Middle_Selected"
+        image_unselected="Toolbar_Middle_Off"
+        menu_position="bottomleft"
+        layout="topleft"
+        left="0"
+        name="options_gear_btn"
+        top="0"
+        width="31" />
+    </layout_panel>
+    <layout_panel
+      auto_resize="false"
+      height="25"
+      layout="topleft"
+      name="options_sort_btn_panel"
+      width="32">
+      <menu_button
+        follows="bottom|left"
+        tool_tip="Show sorting options"
+        height="25"
+        image_hover_unselected="Toolbar_Middle_Over"
+        image_overlay="Conv_toolbar_sort"
+        image_selected="Toolbar_Middle_Selected"
+        image_unselected="Toolbar_Middle_Off"
+        menu_position="bottomleft"
+        layout="topleft"
+        left="0"
+        name="sorting_menu_btn"
+        top="0"
+        width="31" />
+    </layout_panel>
+    <layout_panel
+      auto_resize="false"
+      height="25"
+      layout="topleft"
+      name="trash_btn_panel"
+      width="31">
+      <dnd_button
+        follows="bottom|left"
+        height="25"
+        image_hover_unselected="Toolbar_Right_Over"
+        image_overlay="TrashItem_Off"
+        image_selected="Toolbar_Right_Selected"
+        image_unselected="Toolbar_Right_Off"
+        left="0"
+        layout="topleft"
+        name="trash_btn"
+        tool_tip="Delete selected outfit"
+        top="0"
+        width="31"/>
+    </layout_panel>
+  </layout_stack>
    <panel
    class="panel_outfits_inventory"
    filename="panel_outfits_inventory.xml"
@@ -129,7 +212,7 @@ width="333">
    visible="false"
    left="0"
    tab_group="1"
-   top_pad="6"
+   top_pad="4"
    follows="all" />
    <panel
    class="panel_outfit_edit"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 44da9a8dac..bd8593bf75 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -71,7 +71,7 @@ Voice Server Version: [VOICE_VERSION]
   <string name="LocalTime">[month, datetime, local] [day, datetime, local] [year, datetime, local] [hour, datetime, local]:[min, datetime, local]:[second,datetime, local]</string>
 	<string name="ErrorFetchingServerReleaseNotesURL">Error fetching server release notes URL.</string>
 	<string name="BuildConfiguration">Build Configuration</string>
-
+	
 	<!--  progress -->
 	<string name="ProgressRestoring">Restoring...</string>
 	<string name="ProgressChangingResolution">Changing resolution...</string>
@@ -114,10 +114,10 @@ Voice Server Version: [VOICE_VERSION]
 	<string name="LoginFailedHeader">Login failed.</string>
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
-
+	
 	<string name="AgniGridLabel">Second Life Main Grid (Agni)</string>
 	<string name="AditiGridLabel">Second Life Beta Test Grid (Aditi)</string>
-
+	
 	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
 	<string name="LoginFailedViewerNotPermitted">
 The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
@@ -209,7 +209,7 @@ If you feel this is an error, please contact support@secondlife.com</string>
 	<string name="YouHaveBeenDisconnected">You have been disconnected from the region you were in.</string>
 	<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
 	<string name="TestingDisconnect">Testing viewer disconnect</string>
-
+  
 	<!-- SLShare: User Friendly Filter Names Translation -->
     <string name="BlackAndWhite">Black &amp; White</string>
     <string name="Colors1970">1970&apos;s Colors</string>
@@ -222,7 +222,7 @@ If you feel this is an error, please contact support@secondlife.com</string>
     <string name="LensFlare">Lens Flare</string>
     <string name="Miniature">Miniature</string>
     <string name="Toycamera">Toy Camera</string>
-
+	
     <!-- Tooltip -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
@@ -259,10 +259,10 @@ If you feel this is an error, please contact support@secondlife.com</string>
 	<string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
 	<string name="TooltipOutfitNotInInventory">You can only put items or outfits from your personal inventory into "My outfits"</string>
 	<string name="TooltipCantCreateOutfit">One or more items can't be used inside "My outfits"</string>
-
+	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
-
+	
 	<!-- tooltips for Urls -->
 	<string name="TooltipHttpUrl">Click to view this web page</string>
 	<string name="TooltipSLURL">Click to view this location's information</string>
@@ -370,7 +370,7 @@ are allowed.
 	<string name="AssetUploadServerDifficulties">The server is experiencing unexpected difficulties.</string>
 	<string name="AssetUploadServerUnavaliable">Service not available or upload timeout was reached.</string>
 	<string name="AssetUploadRequestInvalid">
-Error in upload request.  Please visit
+Error in upload request.  Please visit 
 http://secondlife.com/support for help fixing this problem.
 </string>
 
@@ -534,7 +534,7 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
 	<string name="ForceSitAvatar">Force your avatar to sit</string>
 	<string name="ChangeEnvSettings">Change your environment settings</string>
-
+	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
 	<string name="JoinAnExperience"/><!-- intentionally blank -->
@@ -2320,7 +2320,8 @@ For AI Character: Get the closest navigable point to the point provided.
 
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
-	<string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string>
+	<string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string>	
+  <string name="InventoryNoMatchingFavorites">You haven't marked any items as favorites.</string>
 	<string name="PlacesNoMatchingItems">To add a place to your landmarks, click the star to the right of the location name.</string>
 	<string name="FavoritesNoMatchingItems">To add a place to your favorites, click the star to the right of the location name, then save the landmark to "Favorites bar".</string>
 	<string name="MarketplaceNoListing">You have no listings yet.</string>
@@ -2484,13 +2485,13 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InvFolder Uncompressed Sounds">Uncompressed Sounds</string>
 	<string name="InvFolder Animations">Animations</string>
 	<string name="InvFolder Gestures">Gestures</string>
-	<string name="InvFolder Favorite">My Favorites</string>
+	<string name="InvFolder Favorite">Favorites Bar</string>
   <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
       Also, it can be written as "Favorite" or "Favorites".
   We should localize all variants of them with the same value -->
-	<string name="InvFolder favorite">My Favorites</string>
-	<string name="InvFolder Favorites">My Favorites</string>
-	<string name="InvFolder favorites">My Favorites</string>
+	<string name="InvFolder favorite">Favorites Bar</string>
+	<string name="InvFolder Favorites">Favorites Bar</string>
+	<string name="InvFolder favorites">Favorites Bar</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
@@ -2503,7 +2504,7 @@ If you continue to receive this message, please contact Second Life support for
   <string name="InvFolder Materials">Materials</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
-	<string name="InvFolder Friends">Friends</string>
+	<string name="InvFolder Friends">Friends</string>	
 	<string name="InvFolder All">All</string>
 
 	<string name="no_attachments">No attachments worn</string>
@@ -2672,7 +2673,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="UploadFailed">File upload failed: </string>
 	<string name="ObjectOutOfRange">Script (object out of range)</string>
 	<string name="ScriptWasDeleted">Script (deleted from inventory)</string>
-
+	
 	<!-- god tools -->
 	<string name="GodToolsObjectOwnedBy">Object [OBJECT] owned by [OWNER]</string>
 
@@ -2942,14 +2943,12 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .anim
 	<string name="Linden Location">Linden Location</string>
 	<string name="Adult">Adult</string>
 	<string name="Arts&amp;Culture">Arts &amp; Culture</string>
-	<string name="Arts and Culture">Arts &amp; Culture</string>
 	<string name="Business">Business</string>
 	<string name="Educational">Educational</string>
 	<string name="Gaming">Gaming</string>
 	<string name="Hangout">Hangout</string>
 	<string name="Newcomer Friendly">Newcomer Friendly</string>
 	<string name="Parks&amp;Nature">Parks &amp; Nature</string>
-	<string name="Parks and Nature">Parks &amp; Nature</string>
 	<string name="Residential">Residential</string>
 	<!--<string name="Shopping">Shopping</string>	-->
 	<string name="Stage">Stage</string>
@@ -3719,6 +3718,10 @@ Please reinstall viewer from  https://secondlife.com/support/downloads/ and cont
   <string name="inventory_folder_offered-im">
     Inventory folder '[ITEM_NAME]' offered
   </string>
+  <string name="bot_warning">
+  You are chatting with a bot, [NAME]. Do not share any personal information.
+Learn more at https://second.life/scripted-agents.
+  </string>
   <string name="share_alert">
     Drag items from inventory here
   </string>
@@ -3851,7 +3854,7 @@ Please reinstall viewer from  https://secondlife.com/support/downloads/ and cont
 
   <string name="uploading_costs">Uploading costs L$ [AMOUNT]</string>
   <string name="this_costs">This costs L$ [AMOUNT]</string>
-
+  
   <string name="buying_selected_land">This land costs</string>
   <string name="this_object_costs">This item costs</string>
   <string name="giving">You want to give</string>
@@ -3932,7 +3935,7 @@ Abuse Report</string>
   <string name="New Daycycle">New Daycycle</string>
   <string name="New Water">New Water</string>
   <string name="New Sky">New Sky</string>
-
+  
 
   <string name="/bow">/bow</string>
   <string name="/clap">/clap</string>
@@ -4014,7 +4017,7 @@ Please check http://status.secondlifegrid.net to see if there is a known problem
   <string name="Accounting">Accounting</string>
   <string name="Notices">Notices</string>
   <string name="Chat">Chat</string>
-
+  
   <!-- SL Membership -->
   <string name="BaseMembership">Base</string>
   <string name="PremiumMembership">Premium</string>
@@ -4180,7 +4183,7 @@ Try enclosing path to the editor with double quotes.
 
   <!-- commands -->
 
-  <string
+  <string 
 name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_AboutLand_Label">About land</string>
   <string name="Command_Appearance_Label">Outfits</string>
@@ -4213,9 +4216,9 @@ name="Command_360_Capture_Label">360 snapshot</string>
   <string name="Command_View_Label">Camera controls</string>
   <string name="Command_Voice_Label">Voice settings</string>
   <string name="Command_FavoriteFolder_Label">Favorite folder</string>
-	<string name="Command_ResyncAnimations_Label">Resync animations</string>
+  <string name="Command_ResyncAnimations_Label">Resync animations</string>
 
-  <string
+  <string 
 name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
@@ -4248,7 +4251,7 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
   <string name="Command_FavoriteFolder_Tooltip">Open your favorite inventory folder</string>
-	<string name="Command_ResyncAnimations_Tooltip">Synchronizes avatar animations</string>
+  <string name="Command_ResyncAnimations_Tooltip">Synchronizes avatar animations</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>
@@ -4282,7 +4285,7 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
 
   <!-- Spell check settings floater -->
   <string name="UserDictionary">[User]</string>
-
+  
   <!-- Experience Tools strings -->
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>
@@ -4344,7 +4347,7 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
   <string name="Default">Default</string>
   <string name="none_paren_cap">(None)</string>
   <string name="no_limit">No limit</string>
-
+  
   <string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
       The physics shape contains triangles which are too small. Try simplifying the physics model.
   </string>
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index b598bbccd8..50c5285e04 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <folder_view_item
   folder_arrow_image="Folder_Arrow"
+  favorite_image="Inv_Favorite_Star_Full"
+  favorite_content_image="Inv_Favorite_Star_Content"
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 27ec6ded81..865c145022 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inbox_folder_view_folder
   folder_arrow_image="Folder_Arrow"
+  favorite_image="Inv_Favorite_Star_Full"
+  favorite_content_image="Inv_Favorite_Star_Content"
   folder_indentation="8"
   item_height="20" 
   item_top_pad="4"
diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index cdeff6ab05..f246ff764a 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -3,7 +3,6 @@
     name="virtualtrackball"
     width="150"
     height="150"
-    user_resize="false"     
     increment_angle_mouse="1.5f"
     increment_angle_btn="1.0f"    
     image_sphere="VirtualTrackball_Sphere"
diff --git a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
index 23cde55f30..923895be5e 100644
--- a/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/xy_vector.xml
@@ -3,11 +3,9 @@
     name="xyvector"
     width="120"
     height="140"
-    decimal_digits="1"
     label_width="16"
     padding="4"
-    edit_bar_height="18"
-    user_resize="false">
+    edit_bar_height="18">
     
     <xy_vector.border
         visible="true"/>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
index b5cf57ade7..c9eea9a58e 100644
--- a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Guardar una imagen en el inventario cuesta [UPLOAD_COST] L$. Para guardar una imagen como una textura, selecciona uno de los formatos cuadrados.
 	</text>
 	<combo_box label="Resolución" name="texture_size_combo">
-		<combo_box.item label="Ventana actual (512 × 512)" name="CurrentWindow"/>
+		<combo_box.item label="Ventana actual" name="CurrentWindow"/>
 		<combo_box.item label="Pequeña (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Mediana (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
index 4eb9ecf28f..f3119c739e 100644
--- a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="Guardar en disco" name="save_to_computer_btn"/>
-	<button label="Guardar en inventario (L$[AMOUNT])" name="save_to_inventory_btn"/>
+	<button label="Guardar en inventario" name="save_to_inventory_btn"/>
 	<button label="Compartir en los comentarios de Mi perfil" name="save_to_profile_btn"/>
 	<button label="Compartir en Facebook" name="send_to_facebook_btn"/>
 	<button label="Compartir en Twitter" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index cf86427477..8515108943 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1584,6 +1584,10 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].</string>
 	<string name="conference-title-incoming">Conferencia con [AGENT_NAME]</string>
 	<string name="inventory_item_offered-im">Ítem del inventario '[ITEM_NAME]' ofrecido</string>
 	<string name="inventory_folder_offered-im">Carpeta del inventario '[ITEM_NAME]' ofrecida</string>
+	<string name="bot_warning">
+Estás conversando con un bot, [NAME]. No compartas información personal.
+Más información en https://second.life/scripted-agents.
+	</string>
 	<string name="share_alert">Arrastra los ítems desde el invenbtario hasta aquí</string>
 	<string name="facebook_post_success">Has publicado en Facebook.</string>
 	<string name="flickr_post_success">Has publicado en Flickr.</string>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
index 3cf64583d2..a560ff8d5e 100644
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		L&apos;enregistrement d&apos;une image dans l&apos;inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image sous forme de texture, sélectionnez un format carré.
 	</text>
 	<combo_box label="Résolution" name="texture_size_combo">
-		<combo_box.item label="Fenêtre actuelle (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
 		<combo_box.item label="Petite (128 x 128)" name="Small(128x128)"/>
 		<combo_box.item label="Moyenne (256 x 256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512 x 512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
index bdedb9162f..52fa318f8e 100644
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="Enreg. sur le disque" name="save_to_computer_btn"/>
-	<button label="Enreg. dans l&apos;inventaire ([AMOUNT] L$)" name="save_to_inventory_btn"/>
+	<button label="Enreg. dans l&apos;inventaire" name="save_to_inventory_btn"/>
 	<button label="Partager sur le flux de profil" name="save_to_profile_btn"/>
 	<button label="Partager sur Facebook" name="send_to_facebook_btn"/>
 	<button label="Partager sur Twitter" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 3889e26aee..c0f990d86b 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1614,6 +1614,10 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].</string>
 	<string name="conference-title-incoming">Conférence avec [AGENT_NAME]</string>
 	<string name="inventory_item_offered-im">Objet de l’inventaire [ITEM_NAME] offert</string>
 	<string name="inventory_folder_offered-im">Dossier de l’inventaire [ITEM_NAME] offert</string>
+	<string name="bot_warning">
+Vous discutez avec un bot, [NAME]. Ne partagez pas d’informations personnelles.
+En savoir plus sur https://second.life/scripted-agents.
+	</string>
 	<string name="share_alert">Faire glisser les objets de l'inventaire ici</string>
 	<string name="facebook_post_success">Vous avez publié sur Facebook.</string>
 	<string name="flickr_post_success">Vous avez publié sur Flickr.</string>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
index 75b5d64660..21b65e8e69 100644
--- a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Salvare un&apos;immagine nell&apos;inventario costa L$[UPLOAD_COST]. Per salvare l&apos;immagine come texture, selezionare uno dei formati quadrati.
 	</text>
 	<combo_box label="Risoluzione" name="texture_size_combo">
-		<combo_box.item label="Finestra corrente (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Finestra corrente" name="CurrentWindow"/>
 		<combo_box.item label="Piccola (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Media (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
index 50fb3d39fa..7fce171326 100644
--- a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="Salva sul disco" name="save_to_computer_btn"/>
-	<button label="Salva nell&apos;inventario (L$[AMOUNT])" name="save_to_inventory_btn"/>
+	<button label="Salva nell&apos;inventario" name="save_to_inventory_btn"/>
 	<button label="Condividi sul feed del profilo" name="save_to_profile_btn"/>
 	<button label="Condividi su Facebook" name="send_to_facebook_btn"/>
 	<button label="Condividi su Twitter" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 270e7ac3a1..4bd1285f2d 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -1586,6 +1586,10 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].</string>
 	<string name="conference-title-incoming">Chiamata in conferenza con [AGENT_NAME]</string>
 	<string name="inventory_item_offered-im">Offerto oggetto di inventario &quot;[ITEM_NAME]&quot;</string>
 	<string name="inventory_folder_offered-im">Offerta cartella di inventario &quot;[ITEM_NAME]&quot;</string>
+	<string name="bot_warning">
+Stai parlando con un bot, [NAME]. Non condividere informazioni personali.
+Scopri di più su https://second.life/scripted-agents.
+	</string>
 	<string name="facebook_post_success">Hai pubblicato su Facebook.</string>
 	<string name="flickr_post_success">Hai pubblicato su Flickr.</string>
 	<string name="twitter_post_success">Hai pubblicato su Twitter.</string>
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
index f8837c40a7..844a556af1 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml
@@ -44,8 +44,6 @@
 			<check_box label="ビーコンを表示" name="sunbeacon"/>
 		</layout_panel>
 		<layout_panel name="moon_layout">
-			<layout_stack name="moon_stack">
-				<layout_panel name="moon_layout">
 					<text name="moon_label">
 						月
 					</text>
@@ -74,8 +72,6 @@
 					</text>
 					<slider name="moon_brightness"/>
 					<check_box label="ビーコンを表示" name="moonbeacon"/>
-				</layout_panel>
-			</layout_stack>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index c55c11e928..04ecba4264 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -6,7 +6,7 @@
 	</text>
 	<view_border name="hr"/>
 	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item label="現在のウィンドウ (512✕512)" name="CurrentWindow"/>
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
 		<combo_box.item label="小（128✕128）" name="Small(128x128)"/>
 		<combo_box.item label="中（256✕256）" name="Medium(256x256)"/>
 		<combo_box.item label="大（512✕512）" name="Large(512x512)"/>
@@ -16,7 +16,7 @@
 	<spinner label="" name="inventory_snapshot_height"/>
 	<check_box label="縦横比の固定" name="inventory_keep_aspect_check"/>
 	<text name="hint_lbl">
-		画像をテクスチャとして保存する場合は、いずれかの正方形を選択してください。
+		画像をインベントリに保存するには L$[UPLOAD_COST] の費用がかかります。画像をテクスチャとして保存するには平方形式の 1 つを選択してください。
 	</text>
 	<button label="キャンセル" name="cancel_btn"/>
 	<button label="保存" name="save_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index 7a1aa280ec..a979e31c9a 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="ディスクに保存" name="save_to_computer_btn"/>
-	<button label="インベントリに保存（L$ [AMOUNT]）" name="save_to_inventory_btn"/>
+	<button label="インベントリに保存" name="save_to_inventory_btn"/>
 	<button label="プロフィールフィードで共有する" name="save_to_profile_btn"/>
 	<button label="メールで送信" name="save_to_email_btn"/>
 	<text name="fee_hint_lbl">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 106bf91d0c..d0e3cd87c4 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -6149,6 +6149,10 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="inventory_folder_offered-im">
 		フォルダ「[ITEM_NAME]」がインベントリに送られてきました。
 	</string>
+	<string name="bot_warning">
+[NAME]とチャットしています。個人情報を共有しないでください。
+詳細は https://second.life/scripted-agents をご覧ください。
+	</string>
 	<string name="share_alert">
 		インベントリからここにアイテムをドラッグします。
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
index f807148617..7f9dee2369 100644
--- a/indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
@@ -35,8 +35,6 @@
 			<check_box label="Pokaż emiter" name="sunbeacon" />
 		</layout_panel>
 		<layout_panel name="moon_layout">
-			<layout_stack name="moon_stack">
-				<layout_panel name="moon_layout">
 					<text name="moon_label">
 						Księżyc
 					</text>
@@ -59,8 +57,6 @@
 						Jasność:
 					</text>
 					<check_box label="Pokaż emiter" name="moonbeacon" />
-				</layout_panel>
-			</layout_stack>
 		</layout_panel>
 	</layout_stack>
 </panel>                
diff --git a/indra/newview/skins/default/xui/pl/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
index 016b9ca197..04c01940e1 100644
--- a/indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_snapshot_options">
 	<button label="Zapisz na dysku twardym" name="save_to_computer_btn" />
-	<button label="Zapisz do Szafy ([AMOUNT]L$)" name="save_to_inventory_btn" />
+	<button label="Zapisz do Szafy" name="save_to_inventory_btn" />
 	<button label="Wyślij na mój Kanał" name="save_to_profile_btn" />
 	<button label="Załaduj na Facebook" name="send_to_facebook_btn" />
 	<button label="Załaduj na Twitter" name="send_to_twitter_btn" />
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 8032443020..65b487e1b3 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -4412,6 +4412,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 	<string name="inventory_folder_offered-im">
 		Zaoferowano folder: '[ITEM_NAME]'
 	</string>
+	<string name="bot_warning">
+Rozmawiasz z botem [NAME]. Nie udostępniaj żadnych danych osobowych.
+Dowiedz się więcej na https://second.life/scripted-agents.
+	</string>
 	<string name="share_alert">
 		Przeciągaj tutaj rzeczy z Szafy
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
index f3357026d5..28a5142baa 100644
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Salvar uma imagem em seu inventário custa L$[UPLOAD_COST]. Para salvar sua imagem como uma textura, selecione um dos formatos quadrados.
 	</text>
 	<combo_box label="Resolução" name="texture_size_combo">
-		<combo_box.item label="Janela ativa (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Janela ativa" name="CurrentWindow"/>
 		<combo_box.item label="Pequeno (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Médio (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
index 067e5dbd76..f71bc7cd12 100644
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="Salvar no disco" name="save_to_computer_btn"/>
-	<button label="Salvar em inventário (L$[AMOUNT])" name="save_to_inventory_btn"/>
+	<button label="Salvar em inventário" name="save_to_inventory_btn"/>
 	<button label="Compartilhar no feed do perfil" name="save_to_profile_btn"/>
 	<button label="Compartilhar no Facebook" name="send_to_facebook_btn"/>
 	<button label="Compartilhar no Twitter" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 3e33744b85..c7fe195505 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1549,6 +1549,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].</string>
 	<string name="conference-title-incoming">Conversa com [AGENT_NAME]</string>
 	<string name="inventory_item_offered-im">Item do inventário '[ITEM_NAME]' oferecido</string>
 	<string name="inventory_folder_offered-im">Pasta do inventário '[ITEM_NAME]' oferecida</string>
+	<string name="bot_warning">
+Você está conversando com um bot, [NAME]. Não compartilhe informações pessoais.
+Saiba mais em https://second.life/scripted-agents.
+	</string>
 	<string name="facebook_post_success">Você publicou no Facebook.</string>
 	<string name="flickr_post_success">Você publicou no Flickr.</string>
 	<string name="twitter_post_success">Você publicou no Twitter.</string>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
index f07e12e0ed..adc612dfd8 100644
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Сохранение изображения в инвентаре стоит L$[UPLOAD_COST]. Чтобы сохранить его как текстуру, выберите один из квадратных форматов.
 	</text>
 	<combo_box label="Размер" name="texture_size_combo">
-		<combo_box.item label="Текущее окно (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Текущее окно" name="CurrentWindow"/>
 		<combo_box.item label="Маленький (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Средний (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Большой (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
index 7ba03ee0c9..f7fda0b1dc 100644
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="Сохранить на диске" name="save_to_computer_btn"/>
-	<button label="Сохранить в инвентаре (L$[AMOUNT])" name="save_to_inventory_btn"/>
+	<button label="Сохранить в инвентаре" name="save_to_inventory_btn"/>
 	<button label="Поделиться в профиле" name="save_to_profile_btn"/>
 	<button label="Поделиться в Facebook" name="send_to_facebook_btn"/>
 	<button label="Поделиться в Twitter" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 10b0d3578f..1f53723e92 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -4576,6 +4576,10 @@ support@secondlife.com.
 	<string name="inventory_folder_offered-im">
 		Предложена папка инвентаря «[ITEM_NAME]»
 	</string>
+	<string name="bot_warning">
+Вы общаетесь с ботом [NAME]. Не передавайте личные данные.
+Подробнее на https://second.life/scripted-agents.
+	</string>
 	<string name="share_alert">
 		Перетаскивайте вещи из инвентаря сюда
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
index be5940c4b9..160cba8700 100644
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Bir görüntüyü envanterinize kaydetmenin maliyeti L$[UPLOAD_COST] olur. Görüntünüzü bir doku olarak kaydetmek için kare formatlardan birini seçin.
 	</text>
 	<combo_box label="Çözünürlük" name="texture_size_combo">
-		<combo_box.item label="Mevcut Pencere(512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
 		<combo_box.item label="Küçük (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Orta (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Büyük (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
index 1b48bbeec2..a028710b98 100644
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="Diske Kaydet" name="save_to_computer_btn"/>
-	<button label="Envantere Kaydet (L$[AMOUNT])" name="save_to_inventory_btn"/>
+	<button label="Envantere Kaydet" name="save_to_inventory_btn"/>
 	<button label="Profil Akışında Paylaş" name="save_to_profile_btn"/>
 	<button label="Facebook&apos;ta Paylaş" name="send_to_facebook_btn"/>
 	<button label="Twitter&apos;da Paylaş" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index d992788e13..c98de5aab9 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -4579,6 +4579,10 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="inventory_folder_offered-im">
 		&quot;[ITEM_NAME]&quot; envanter klasörü sunuldu
 	</string>
+	<string name="bot_warning">
+Bir bot ile sohbet ediyorsunuz, [NAME]. Kişisel bilgilerinizi paylaşmayın.
+Daha fazla bilgi için: https://second.life/scripted-agents.
+	</string>
 	<string name="share_alert">
 		Envanterinizden buraya öğeler sürükleyin
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
index 094bf019b4..9c45c54a5e 100644
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		將圖像儲存到收納區的費用為 L$[UPLOAD_COST]。 若要將圖像存為材質，請選擇一個正方格式。
 	</text>
 	<combo_box label="解析度" name="texture_size_combo">
-		<combo_box.item label="目前視窗(512x512)" name="CurrentWindow"/>
+		<combo_box.item label="目前視窗" name="CurrentWindow"/>
 		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
 		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
 		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
index d7c65bb25e..d9536882ac 100644
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_options">
 	<button label="儲存到硬碟" name="save_to_computer_btn"/>
-	<button label="儲存到收納區（L$[AMOUNT]）" name="save_to_inventory_btn"/>
+	<button label="儲存到收納區" name="save_to_inventory_btn"/>
 	<button label="分享至檔案訊息發佈" name="save_to_profile_btn"/>
 	<button label="分享到臉書" name="send_to_facebook_btn"/>
 	<button label="分享到推特" name="send_to_twitter_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index d053d2b30d..59ba2a7e19 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -4572,6 +4572,10 @@ http://secondlife.com/support 求助解決問題。
 	<string name="inventory_folder_offered-im">
 		收納區資料夾&apos;[ITEM_NAME]&apos;已向人提供
 	</string>
+	<string name="bot_warning">
+您正在与人工智能机器人 [NAME] 聊天。请勿分享任何个人信息。
+了解更多：https://second.life/scripted-agents。
+	</string>
 	<string name="share_alert">
 		將收納區物品拖曳到這裡
 	</string>
author	Erik Kundiman <erik@megapahit.org>	2025-04-19 22:07:21 +0800
committer	Erik Kundiman <erik@megapahit.org>	2025-04-19 22:12:00 +0800
commit	ba20ac5718de63c499fe08ea4079695962dc2f17 (patch)
tree	88c7b17304445278adb73135e2794a2afa3aa20f /indra/newview
parent	ad9c801edb13568657c0964ebfb74257da6d9e00 (diff)
parent	11cd9b91a2cf3e71cb6dae0a08dff2b878163ce8 (diff)