Commit 03e9b129 authored by Kitty Barnett's avatar Kitty Barnett

Merged with .Catznip tip

--HG--
branch : Catznip
parents 5e9ab303 d76f0d9f
......@@ -229,7 +229,7 @@
/>
<command name="quickprefs"
available_in_toybox="true"
icon="Command_Preferences_Icon"
icon="Edit_Wrench"
label_ref="Command_QuickPrefs_Label"
tooltip_ref="Command_QuickPrefs_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
......
......@@ -114,6 +114,7 @@ void LLQuickPrefsAppearancePanel::onVisibilityChange(BOOL fVisible)
{
if (fVisible)
{
refreshHover();
refreshComplexity();
refreshMaxComplexity();
refreshMaxNonImpostors();
......
......@@ -1135,7 +1135,7 @@ bool LLPanelWearing::hasItemSelected()
{
return mCOFItemsList->getSelectedItem() != NULL;
}
else if (mInvPanel->getVisible())
else if ( (mInvPanel) && (mInvPanel->getVisible()) )
{
return mInvPanel->getRootFolder()->getCurSelectedItem() != NULL;
}
......
......@@ -22,6 +22,7 @@
</text>
<panel
border="false"
follows="left|top"
height="155"
layout="topleft"
name="sound_volume_controls"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment