7 files changed, 32 insertions, 15 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 4f664a1ccc..3ece1c12bf 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -64,8 +64,6 @@
 // use this to control "jumping" behavior when Ctrl-Tabbing
 const S32 TABBED_FLOATER_OFFSET = 0;
 
-extern LLControlGroup gSavedSettings;
-
 namespace LLInitParam
 {
 	void TypeValues<LLFloaterEnums::EOpenPositioning>::declareValues()
@@ -653,13 +651,7 @@ void LLFloater::openFloater(const LLSD& key)
 		&& !getFloaterHost()
 		&& (!getVisible() || isMinimized()))
 	{
-        //Don't play a sound for incoming voice call based upon chat preference setting
-        bool playSound = !(getName() == "incoming call" && gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall") == FALSE);
-
-        if(playSound)
-        {
-            make_ui_sound("UISndWindowOpen");
-        }
+		make_ui_sound("UISndWindowOpen");
 	}
 
 	//RN: for now, we don't allow rehosting from one multifloater to another
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 951389b856..2405c3a1a3 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2354,7 +2354,13 @@ void LLIncomingCallDialog::onAvatarNameCache(const LLUUID& agent_id,
 void LLIncomingCallDialog::onOpen(const LLSD& key)
 {
 	LLCallDialog::onOpen(key);
-	make_ui_sound("UISndStartIM");
+
+	if (gSavedSettings.getBOOL("PlaySoundIncomingVoiceCall"))
+	{
+		// play a sound for incoming voice call if respective property is set
+		make_ui_sound("UISndStartIM");
+	}
+
 	LLStringUtil::format_map_t args;
 	LLGroupData data;
 	// if it's a group call, retrieve group name to use it in question
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index a32ed258f8..03fa2e2080 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -394,6 +394,11 @@ void LLSidepanelAppearance::toggleWearableEditPanel(BOOL visible, LLViewerWearab
 		return;
 	}
 
+	if(!visible)
+	{
+		mEditWearable->setWearable(NULL);
+	}
+
 	// If we're just switching between outfit and wearable editing or updating item,
 	// don't end customization and don't switch camera
 	// Don't end customization and don't switch camera without visibility change
diff --git a/indra/newview/llwlanimator.cpp b/indra/newview/llwlanimator.cpp
index 2142885767..c8879e73eb 100644
--- a/indra/newview/llwlanimator.cpp
+++ b/indra/newview/llwlanimator.cpp
@@ -155,17 +155,28 @@ F64 LLWLAnimator::getDayTime()
 
 		// we're not solving the non-linear equation that determines sun phase
 		// we're just linearly interpolating between the major points
-		if (phase <= 5.0 / 4.0) {
+
+		if (phase <= 5.0 / 4.0)
+		{
+			// mDayTime from 0.33 to 0.75 (6:00 to 21:00)
 			mDayTime = (1.0 / 3.0) * phase + (1.0 / 3.0);
 		}
+		else if (phase > 7.0 / 4.0)
+		{
+			// maximum value for phase is 2
+			// mDayTime from 0.25 to 0.33 (3:00 to 6:00)
+			mDayTime = (1.0 / 3.0) - (1.0 / 3.0) * (2 - phase);
+		}
 		else
 		{
+			// phase == 3/2 is where day restarts (24:00)
+			// mDayTime from 0.75 to 0.999 and 0 to 0.25 (21:00 to 03:00)
 			mDayTime = phase - (1.0 / 2.0);
-		}
 
-		if(mDayTime > 1)
-		{
-			mDayTime--;
+			if(mDayTime > 1)
+			{
+				mDayTime--;
+			}
 		}
 
 		return mDayTime;
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index ffbb6aa28b..d714cc613e 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -8,6 +8,7 @@
  layout="topleft"
  name="outgoing call"
  help_topic="outgoing_call"
+ sound_flags="0"
  save_dock_state="true"
  title="CALLING"
  width="410">
diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index b53698a9f2..62cce3a1e3 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -7,6 +7,7 @@
          save_rect="true"
          save_visibility="true"
          title="SCENE LOAD STATISTICS"
+         min_width="250"
          width="400">
     <scroll_container follows="top|left|bottom|right"
                       bottom="400"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index be9b93837a..e4f735740b 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -8,6 +8,7 @@
          save_rect="true"
          save_visibility="true"
          title="STATISTICS"
+         min_width="250"
          width="270">
   <scroll_container follows="all"
                     height="380"