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
fda16ba8
Commit
fda16ba8
authored
Feb 03, 2021
by
NiranV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: Several warnings of missing or wrong widgets found in several parts of the UI.
parent
17cb483e
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
43 additions
and
43 deletions
+43
-43
indra/newview/llpaneleditwearable.cpp
indra/newview/llpaneleditwearable.cpp
+23
-18
indra/newview/llpaneleditwearable.h
indra/newview/llpaneleditwearable.h
+1
-1
indra/newview/llpanellogin.cpp
indra/newview/llpanellogin.cpp
+9
-13
indra/newview/llsidepanelappearance.cpp
indra/newview/llsidepanelappearance.cpp
+1
-1
indra/newview/llvovolume.cpp
indra/newview/llvovolume.cpp
+7
-1
indra/newview/skins/default/xui/en/floater_fast_timers.xml
indra/newview/skins/default/xui/en/floater_fast_timers.xml
+1
-2
indra/newview/skins/default/xui/en/panel_edit_alpha.xml
indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+0
-5
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+1
-0
indra/newview/skins/default/xui/en/sidepanel_item_info.xml
indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+0
-1
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+0
-1
No files found.
indra/newview/llpaneleditwearable.cpp
View file @
fda16ba8
...
...
@@ -791,8 +791,9 @@ BOOL LLPanelEditWearable::postBuild()
LL_WARNS
()
<<
"could not get wearable subpart dictionary entry for subpart: "
<<
subpart_e
<<
LL_ENDL
;
continue
;
}
const
std
::
string
accordion_tab
=
subpart_entry
->
mAccordionTab
;
//BD
/*const std::string accordion_tab = subpart_entry->mAccordionTab;
LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
...
...
@@ -803,7 +804,7 @@ BOOL LLPanelEditWearable::postBuild()
}
// initialize callback to ensure camera view changes appropriately.
tab
->
setDropDownStateChangedCallback
(
boost
::
bind
(
&
LLPanelEditWearable
::
onTabExpandedCollapsed
,
this
,
_2
,
index
));
tab->setDropDownStateChangedCallback(boost::bind(&LLPanelEditWearable::onTabExpandedCollapsed,this,_2,index));
*/
}
// initialize texture and color picker controls
...
...
@@ -1196,10 +1197,12 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
}
const
std
::
string
scrolling_panel
=
subpart_entry
->
mParamList
;
const
std
::
string
accordion_tab
=
subpart_entry
->
mAccordionTab
;
//BD
//const std::string accordion_tab = subpart_entry->mAccordionTab;
LLScrollingPanelList
*
panel_list
=
getChild
<
LLScrollingPanelList
>
(
scrolling_panel
);
LLAccordionCtrlTab
*
tab
=
getChild
<
LLAccordionCtrlTab
>
(
accordion_tab
);
//BD
//LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
if
(
!
panel_list
)
{
...
...
@@ -1207,22 +1210,23 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
continue
;
}
if
(
!
tab
)
//BD
/*if (!tab)
{
LL_WARNS() << "could not get llaccordionctrltab from UI with name: " << accordion_tab << LL_ENDL;
continue;
}
// Don't show female subparts if you're not female, etc.
if
(
!
(
gAgentAvatarp
->
getSex
()
&
subpart_entry
->
mSex
))
{
tab
->
setVisible
(
FALSE
);
continue
;
}
else
{
tab
->
setVisible
(
TRUE
);
}
// Don't show female subparts if you're not female, etc.
if (!(gAgentAvatarp->getSex() & subpart_entry->mSex))
{
tab->setVisible(FALSE);
continue;
}
else
{
tab->setVisible(TRUE);
}
*/
// what edit group do we want to extract params for?
const
std
::
string
edit_group
=
subpart_entry
->
mEditGroup
;
...
...
@@ -1237,7 +1241,8 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
jointp
=
gAgentAvatarp
->
getJoint
(
"mHead"
);
}
buildParamList
(
panel_list
,
sorted_params
,
tab
,
jointp
);
//BD
buildParamList
(
panel_list
,
sorted_params
,
/*tab,*/
jointp
);
updateScrollingPanelUI
();
}
...
...
@@ -1501,7 +1506,7 @@ void LLPanelEditWearable::getSortedParams(value_map_t &sorted_params, const std:
}
}
void
LLPanelEditWearable
::
buildParamList
(
LLScrollingPanelList
*
panel_list
,
value_map_t
&
sorted_params
,
LLAccordionCtrlTab
*
tab
,
LLJoint
*
jointp
)
void
LLPanelEditWearable
::
buildParamList
(
LLScrollingPanelList
*
panel_list
,
value_map_t
&
sorted_params
,
/*
LLAccordionCtrlTab *tab,
*/
LLJoint
*
jointp
)
{
// sorted_params is sorted according to magnitude of effect from
// least to greatest. Adding to the front of the child list
...
...
indra/newview/llpaneleditwearable.h
View file @
fda16ba8
...
...
@@ -85,7 +85,7 @@ class LLPanelEditWearable : public LLPanel
void
updateScrollingPanelUI
();
LLPanel
*
getPanel
(
LLWearableType
::
EType
type
);
void
getSortedParams
(
value_map_t
&
sorted_params
,
const
std
::
string
&
edit_group
);
void
buildParamList
(
LLScrollingPanelList
*
panel_list
,
value_map_t
&
sorted_params
,
LLAccordionCtrlTab
*
tab
,
LLJoint
*
jointp
);
void
buildParamList
(
LLScrollingPanelList
*
panel_list
,
value_map_t
&
sorted_params
,
/*
LLAccordionCtrlTab *tab,
*/
LLJoint
*
jointp
);
// update bottom bar buttons ("Save", "Revert", etc)
void
updateVerbs
();
...
...
indra/newview/llpanellogin.cpp
View file @
fda16ba8
...
...
@@ -260,7 +260,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
// STEAM-14: When user presses Enter with this field in focus, initiate login
mPasswordEdit
->
setCommitCallback
(
boost
::
bind
(
&
LLPanelLogin
::
onClickConnect
,
this
));
mRememberPassCheck
=
getChild
<
LLCheckBoxCtrl
>
(
"remember_
check
"
);
mRememberPassCheck
=
getChild
<
LLCheckBoxCtrl
>
(
"remember_
password
"
);
mRememberMeCheck
=
getChild
<
LLCheckBoxCtrl
>
(
"remember_name"
);
mRememberMeCheck
->
setCommitCallback
(
boost
::
bind
(
&
LLPanelLogin
::
onRememberUserCheck
,
this
));
...
...
@@ -513,10 +513,9 @@ void LLPanelLogin::populateFields(LLPointer<LLCredential> credential, bool remem
}
else*/
{
sInstance
->
getChild
<
LLUICtrl
>
(
"remember_name"
)
->
setValue
(
remember_user
);
LLUICtrl
*
remember_password
=
sInstance
->
getChild
<
LLUICtrl
>
(
"remember_password"
);
remember_password
->
setValue
(
remember_user
&&
remember_psswrd
);
remember_password
->
setEnabled
(
remember_user
);
sInstance
->
mRememberMeCheck
->
setValue
(
remember_user
);
sInstance
->
mRememberPassCheck
->
setValue
(
remember_user
&&
remember_psswrd
);
sInstance
->
mRememberPassCheck
->
setEnabled
(
remember_user
);
sInstance
->
populateUserList
(
credential
);
}
}
...
...
@@ -980,22 +979,19 @@ void LLPanelLogin::onRememberUserCheck()
{
if
(
sInstance
)
{
LLCheckBoxCtrl
*
remember_name
(
sInstance
->
getChild
<
LLCheckBoxCtrl
>
(
"remember_name"
));
LLCheckBoxCtrl
*
remember_psswrd
(
sInstance
->
getChild
<
LLCheckBoxCtrl
>
(
"remember_password"
));
LLComboBox
*
user_combo
(
sInstance
->
getChild
<
LLComboBox
>
(
"username_combo"
));
bool
remember
=
remember_name
->
getValue
().
asBoolean
();
if
(
user_c
ombo
->
getCurrentIndex
()
!=
-
1
&&
!
remember
)
bool
remember
=
sInstance
->
mRememberMeCheck
->
getValue
().
asBoolean
();
if
(
sInstance
->
mUsernameC
ombo
->
getCurrentIndex
()
!=
-
1
&&
!
remember
)
{
remember
=
true
;
remember_name
->
setValue
(
true
);
sInstance
->
mRememberMeCheck
->
setValue
(
true
);
LLNotificationsUtil
::
add
(
"LoginCantRemoveUsername"
);
}
if
(
!
remember
)
{
remember_psswrd
->
setValue
(
false
);
sInstance
->
mRememberPassCheck
->
setValue
(
false
);
}
remember_psswrd
->
setEnabled
(
remember
);
sInstance
->
mRememberPassCheck
->
setEnabled
(
remember
);
}
}
...
...
indra/newview/llsidepanelappearance.cpp
View file @
fda16ba8
...
...
@@ -487,7 +487,7 @@ void LLSidepanelAppearance::setWearablesLoading(bool val)
{
getChildView
(
"wearables_loading_indicator"
)
->
setVisible
(
val
);
//BD
if
(
!
getChildView
(
"outfit_edit"
)
->
getVisible
())
if
(
!
getChildView
(
"
panel_
outfit_edit"
)
->
getVisible
())
getChildView
(
"edit_outfit_btn"
)
->
setVisible
(
!
val
);
mCoFLoading
=
val
;
...
...
indra/newview/llvovolume.cpp
View file @
fda16ba8
...
...
@@ -712,6 +712,11 @@ void LLVOVolume::updateTextureVirtualSize(bool forced)
LL_RECORD_BLOCK_TIME
(
FTM_VOLUME_TEXTURES
);
// Update the pixel area of all faces
if
(
mDrawable
.
isNull
())
{
return
;
}
if
(
!
forced
)
{
if
(
!
isVisible
())
...
...
@@ -2396,7 +2401,8 @@ bool LLVOVolume::notifyAboutCreatingTexture(LLViewerTexture *texture)
//setup new materials
for
(
map_te_material
::
const_iterator
it
=
new_material
.
begin
(),
end
=
new_material
.
end
();
it
!=
end
;
++
it
)
{
LLMaterialMgr
::
getInstance
()
->
put
(
getID
(),
it
->
first
,
*
it
->
second
);
// These are placeholder materials, they shouldn't be sent to server
LLMaterialMgr
::
getInstance
()
->
setLocalMaterial
(
getRegion
()
->
getRegionID
(),
it
->
second
);
LLViewerObject
::
setTEMaterialParams
(
it
->
first
,
it
->
second
);
}
...
...
indra/newview/skins/default/xui/en/floater_fast_timers.xml
View file @
fda16ba8
...
...
@@ -71,8 +71,7 @@
width=
"15"
follows=
"top|right|bottom"
name=
"scroll_vert"
orientation=
"vertical"
step_size=
"16"
/>
orientation=
"vertical"
/>
</layout_panel>
<layout_panel
name=
"timers_panel"
auto_resize=
"true"
...
...
indra/newview/skins/default/xui/en/panel_edit_alpha.xml
View file @
fda16ba8
...
...
@@ -31,7 +31,6 @@
top=
"0"
width=
"313"
>
<check_box
control_name=
"LowerAlphaTextureInvisible"
follows=
"left|top"
height=
"16"
layout=
"topleft"
...
...
@@ -56,7 +55,6 @@
</texture_picker>
<check_box
control_name=
"UpperAlphaTextureInvisible"
follows=
"left|top"
height=
"16"
layout=
"topleft"
...
...
@@ -81,7 +79,6 @@
</texture_picker>
<check_box
control_name=
"HeadAlphaTextureInvisible"
follows=
"left|top"
height=
"16"
layout=
"topleft"
...
...
@@ -106,7 +103,6 @@
</texture_picker>
<check_box
control_name=
"Eye AlphaTextureInvisible"
follows=
"left|top"
height=
"16"
layout=
"topleft"
...
...
@@ -131,7 +127,6 @@
</texture_picker>
<check_box
control_name=
"HairAlphaTextureInvisible"
follows=
"left|top"
height=
"16"
layout=
"topleft"
...
...
indra/newview/skins/default/xui/en/panel_outfit_edit.xml
View file @
fda16ba8
...
...
@@ -138,6 +138,7 @@ width="320">
left=
"3"
top=
"0"
mouse_opaque=
"false"
name=
"outfit_name_and_status"
value=
"Now editing..."
use_ellipses=
"true"
/>
<text
...
...
indra/newview/skins/default/xui/en/sidepanel_item_info.xml
View file @
fda16ba8
...
...
@@ -312,7 +312,6 @@
follows=
"left|top"
decimal_digits=
"0"
increment=
"1"
control_name=
"Edit Cost"
name=
"Edit Cost"
left_pad=
"-7"
width=
"86"
...
...
indra/newview/skins/default/xui/en/sidepanel_task_info.xml
View file @
fda16ba8
...
...
@@ -357,7 +357,6 @@
decimal_digits=
"0"
increment=
"1"
left_pad=
"-7"
control_name=
"Edit Cost"
name=
"Edit Cost"
width=
"86"
min_val=
"1"
...
...
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