Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
NiranV
Black Dragon Viewer
Commits
03e9b129
Commit
03e9b129
authored
Dec 11, 2016
by
Kitty Barnett
Browse files
Options
Browse Files
Download
Plain Diff
Merged with .Catznip tip
--HG-- branch : Catznip
parents
5e9ab303
d76f0d9f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
2 deletions
+4
-2
indra/newview/app_settings/commands.xml
indra/newview/app_settings/commands.xml
+1
-1
indra/newview/llpanelquickprefsappearance.cpp
indra/newview/llpanelquickprefsappearance.cpp
+1
-0
indra/newview/llpanelwearing.cpp
indra/newview/llpanelwearing.cpp
+1
-1
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
.../newview/skins/default/xui/en/panel_preferences_sound.xml
+1
-0
No files found.
indra/newview/app_settings/commands.xml
View file @
03e9b129
...
...
@@ -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"
...
...
indra/newview/llpanelquickprefsappearance.cpp
View file @
03e9b129
...
...
@@ -114,6 +114,7 @@ void LLQuickPrefsAppearancePanel::onVisibilityChange(BOOL fVisible)
{
if
(
fVisible
)
{
refreshHover
();
refreshComplexity
();
refreshMaxComplexity
();
refreshMaxNonImpostors
();
...
...
indra/newview/llpanelwearing.cpp
View file @
03e9b129
...
...
@@ -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
;
}
...
...
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View file @
03e9b129
...
...
@@ -22,6 +22,7 @@
</text>
<panel
border=
"false"
follows=
"left|top"
height=
"155"
layout=
"topleft"
name=
"sound_volume_controls"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment