Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
a5d7485c
Commit
a5d7485c
authored
13 years ago
by
Nyx (Neal Orman)
Browse files
Options
Downloads
Plain Diff
Automated merge with
https://hg.secondlife.com/mesh-development
parents
57581b68
41f3080d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llfloatertools.cpp
+14
-10
14 additions, 10 deletions
indra/newview/llfloatertools.cpp
indra/newview/skins/default/xui/en/floater_tools.xml
+3
-15
3 additions, 15 deletions
indra/newview/skins/default/xui/en/floater_tools.xml
with
17 additions
and
25 deletions
indra/newview/llfloatertools.cpp
+
14
−
10
View file @
a5d7485c
...
...
@@ -455,27 +455,31 @@ void LLFloaterTools::refresh()
S32
prim_count
=
LLSelectMgr
::
getInstance
()
->
getSelection
()
->
getObjectCount
();
S32
link_count
=
LLSelectMgr
::
getInstance
()
->
getSelection
()
->
getRootObjectCount
();
LLStringUtil
::
format_map_t
args
;
args
[
"OBJ_COUNT"
]
=
llformat
(
"%.1d"
,
link_count
);
args
[
"PRIM_COUNT"
]
=
llformat
(
"%.1d"
,
prim_count
);
LLStringUtil
::
format_map_t
selection_
args
;
selection_
args
[
"OBJ_COUNT"
]
=
llformat
(
"%.1d"
,
link_count
);
selection_
args
[
"PRIM_COUNT"
]
=
llformat
(
"%.1d"
,
prim_count
);
std
::
ostringstream
selection_info
;
selection_info
<<
getString
(
"status_selectcount"
,
args
);
bool
show_prim_equiv
=
(
link_cost
!=
prim_count
)
&&
link_cost
;
bool
show_adv_weight
=
gSavedSettings
.
getBOOL
(
"ShowAdvancedBuilderOptions"
);
bool
show_mesh_cost
=
gMeshRepo
.
meshRezEnabled
();
if
(
show_prim_equiv
&&
show_mesh_cost
)
if
(
show_mesh_cost
)
{
selection_info
<<
": "
;
args
[
"SEL_WEIGHT"
]
=
llformat
(
"%.1
f
"
,
link_cost
);
selection_
info
<<
getString
(
"status_selectprimequiv"
,
args
);
LLStringUtil
::
format_map_t
prim_equiv_args
;
prim_equiv_
args
[
"SEL_WEIGHT"
]
=
llformat
(
"%.1
d
"
,
(
S32
)
link_cost
);
selection_
args
[
"PE_STRING"
]
=
getString
(
"status_selectprimequiv"
,
prim_equiv_
args
);
}
else
{
selection_args
[
"PE_STRING"
]
=
""
;
}
selection_info
<<
getString
(
"status_selectcount"
,
selection_args
);
if
(
show_adv_weight
)
{
show_prim_equiv
?
(
selection_info
<<
","
)
:
(
selection_info
<<
"."
)
;
selection_info
<<
","
;
childSetTextArg
(
"selection_weight"
,
"[PHYS_WEIGHT]"
,
llformat
(
"%.1f"
,
link_phys_cost
));
childSetTextArg
(
"selection_weight"
,
"[DISP_WEIGHT]"
,
llformat
(
"%.1d"
,
calcRenderCost
()));
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/floater_tools.xml
+
3
−
15
View file @
a5d7485c
...
...
@@ -48,11 +48,11 @@
</floater.string>
<floater.string
name=
"status_selectcount"
>
[OBJ_COUNT] objects ( [PRIM_COUNT] prims ) selected
[OBJ_COUNT] objects ( [PRIM_COUNT] prims
[PE_STRING]
) selected
</floater.string>
<floater.string
name=
"status_selectprimequiv"
>
PE weight
[SEL_WEIGHT]
,
[SEL_WEIGHT]
prim equivs
</floater.string>
<button
follows=
"left|top"
...
...
@@ -271,18 +271,6 @@
<button.commit_callback
function=
"BuildTool.UnlinkObjects"
/>
</button>
<text
text_color=
"LtGray_50"
follows=
"top|left"
halign=
"left"
left_pad=
"3"
name=
"RenderingCost"
tool_tip=
"Shows the rendering cost calculated for this object"
top_delta=
"11"
type=
"string"
width=
"100"
>
þ: [COUNT]
</text>
<check_box
control_name=
"ScaleUniform"
height=
"19"
...
...
@@ -754,7 +742,7 @@
top_pad=
"0"
visible=
"false"
width=
"280"
>
Physics weight [PHYS_WEIGHT],
Display weigh
t [DISP_WEIGHT].
Physics weight [PHYS_WEIGHT],
Render Cos
t [DISP_WEIGHT].
</text>
<!-- <text -->
<!-- text_color="LtGray_50" -->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment